loplugin:includeform: sw

Change-Id: Ifc3c4c31a31ee7189eeab6f1af30b94d64f2f92a
author: Stephan Bergmann <sbergman@redhat.com> 2017-10-23 22:30:30 +0200
committer: Stephan Bergmann <sbergman@redhat.com> 2017-10-23 22:45:50 +0200
commit: 62f47bb2a54536d6e1cf14b16d2e3b963ba651a6 (patch)
tree: 9190a17b910c36a44dee1b6e8d84460f53a16fa9 /sw
parent: 34307a8a7da7def2f3ee207c08b59a48864a03f8 (diff)
529 files changed, 1804 insertions, 1804 deletions
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index 7165f80c48af..ed6eb3fc6904 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -28,10 +28,10 @@
 #include <vcl/lineinfo.hxx>
 #include <vcl/window.hxx>
 
-#include <docufld.hxx>
-#include <postithelper.hxx>
-#include <swrect.hxx>
-#include <SidebarWindowsTypes.hxx>
+#include "docufld.hxx"
+#include "postithelper.hxx"
+#include "swrect.hxx"
+#include "SidebarWindowsTypes.hxx"
 
 class PopupMenu;
 class OutlinerParaObject;
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx
index c7c61ba39618..2ebec2f20758 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -22,8 +22,8 @@
 
 #include <vcl/pdfextoutdevdata.hxx>
 #include <i18nlangtag/lang.h>
-#include <swrect.hxx>
-#include <swtypes.hxx>
+#include "swrect.hxx"
+#include "swtypes.hxx"
 
 #include <map>
 #include <memory>
diff --git a/sw/inc/IDocumentLayoutAccess.hxx b/sw/inc/IDocumentLayoutAccess.hxx
index 3472ac9ba4b0..bc1c4aa65e4f 100644
--- a/sw/inc/IDocumentLayoutAccess.hxx
+++ b/sw/inc/IDocumentLayoutAccess.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_INC_IDOCUMENTLAYOUTACCESS_HXX
 #define INCLUDED_SW_INC_IDOCUMENTLAYOUTACCESS_HXX
 
-#include <swtypes.hxx>
+#include "swtypes.hxx"
 
 class SwViewShell;
 class SwRootFrame;
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index ff0a13cccbc4..3fb7090e5067 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SW_INC_IDOCUMENTMARKACCESS_HXX
 
 #include <sal/types.h>
-#include <IMark.hxx>
+#include "IMark.hxx"
 #include <memory>
 
 class SwPaM;
diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index 3f42f32d98ea..f3a6f66dff13 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
-#include <docary.hxx>
+#include "docary.hxx"
 
 class SwRangeRedline;
 class SwTableRowRedline;
diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index 00d4c44df041..6e9942bce66c 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SW_INC_IDOCUMENTSETTINGACCESS_HXX
 
 #include <tools/solar.h>
-#include <fldupde.hxx>
+#include "fldupde.hxx"
 #include <i18nlangtag/lang.h>
 #include <memory>
 
diff --git a/sw/inc/IDocumentUndoRedo.hxx b/sw/inc/IDocumentUndoRedo.hxx
index 62e057131bd7..c8890b7b9345 100644
--- a/sw/inc/IDocumentUndoRedo.hxx
+++ b/sw/inc/IDocumentUndoRedo.hxx
@@ -22,7 +22,7 @@
 
 #include <sal/types.h>
 
-#include <swundo.hxx>
+#include "swundo.hxx"
 
 class SwRewriter;
 class SwNodes;
diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index f4b38a9a189b..ca3b1efa9f44 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -20,12 +20,12 @@
 #define INCLUDED_SW_INC_IMARK_HXX
 
 #include <vcl/keycod.hxx>
-#include <calbck.hxx>
-#include <pam.hxx>
+#include "calbck.hxx"
+#include "pam.hxx"
 #include <boost/operators.hpp>
 #include <map>
 #include <memory>
-#include <swdllapi.h>
+#include "swdllapi.h"
 
 struct SwPosition;
 
diff --git a/sw/inc/PageColumnPopup.hxx b/sw/inc/PageColumnPopup.hxx
index bad990987955..a0b217a5329e 100644
--- a/sw/inc/PageColumnPopup.hxx
+++ b/sw/inc/PageColumnPopup.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SW_INC_PAGECOLUMNPOPUP_HXX
 
 #include <sfx2/tbxctrl.hxx>
-#include <swdllapi.h>
+#include "swdllapi.h"
 #include <vcl/vclenum.hxx>
 #include <functional>
 
diff --git a/sw/inc/PageMarginPopup.hxx b/sw/inc/PageMarginPopup.hxx
index 52695206de85..d3f4424d7515 100644
--- a/sw/inc/PageMarginPopup.hxx
+++ b/sw/inc/PageMarginPopup.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SW_INC_PAGEMARGINPOPUP_HXX
 
 #include <sfx2/tbxctrl.hxx>
-#include <swdllapi.h>
+#include "swdllapi.h"
 #include <vcl/vclenum.hxx>
 #include <functional>
 
diff --git a/sw/inc/PageOrientationPopup.hxx b/sw/inc/PageOrientationPopup.hxx
index 6fe37648873c..1d403a9332b9 100644
--- a/sw/inc/PageOrientationPopup.hxx
+++ b/sw/inc/PageOrientationPopup.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SW_INC_PAGEORIENTATIONPOPUP_HXX
 
 #include <sfx2/tbxctrl.hxx>
-#include <swdllapi.h>
+#include "swdllapi.h"
 #include <vcl/vclenum.hxx>
 #include <functional>
 
diff --git a/sw/inc/PageSizePopup.hxx b/sw/inc/PageSizePopup.hxx
index ab9cd80f1c7b..4355ec23cb70 100644
--- a/sw/inc/PageSizePopup.hxx
+++ b/sw/inc/PageSizePopup.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SW_INC_PAGESIZEPOPUP_HXX
 
 #include <sfx2/tbxctrl.hxx>
-#include <swdllapi.h>
+#include "swdllapi.h"
 #include <vcl/vclenum.hxx>
 #include <functional>
 
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 65209c00d334..581cf46b1af1 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -30,11 +30,11 @@
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 #include <tools/link.hxx>
-#include <swrect.hxx>
+#include "swrect.hxx"
 #include <unotools/configitem.hxx>
 #include <unotools/options.hxx>
 #include <com/sun/star/uno/Any.hxx>
-#include <SidebarWindowsTypes.hxx>
+#include "SidebarWindowsTypes.hxx"
 #include <svl/lstner.hxx>
 #include <vcl/vclptr.hxx>
 #include <LibreOfficeKit/LibreOfficeKitTypes.h>
diff --git a/sw/inc/SwDocIdle.hxx b/sw/inc/SwDocIdle.hxx
index f20fabd44f98..def54cdcc287 100644
--- a/sw/inc/SwDocIdle.hxx
+++ b/sw/inc/SwDocIdle.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_SWDOCIDLE_HXX
 #define INCLUDED_SW_INC_SWDOCIDLE_HXX
 
-#include <doc.hxx>
+#include "doc.hxx"
 #include <vcl/idle.hxx>
 
 namespace sw {
diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx
index e333c137f85e..e1b4b997f004 100644
--- a/sw/inc/SwNodeNum.hxx
+++ b/sw/inc/SwNodeNum.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_INC_SWNODENUM_HXX
 #define INCLUDED_SW_INC_SWNODENUM_HXX
 
-#include <SwNumberTree.hxx>
+#include "SwNumberTree.hxx"
 
 class SwTextNode;
 struct SwPosition;
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index 283956f681e2..c81f159753ec 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -22,8 +22,8 @@
 
 #include <set>
 #include <vector>
-#include <swdllapi.h>
-#include <SwNumberTreeTypes.hxx>
+#include "swdllapi.h"
+#include "SwNumberTreeTypes.hxx"
 
 class SwNumberTreeNode;
 
diff --git a/sw/inc/SwRewriter.hxx b/sw/inc/SwRewriter.hxx
index 2e060c4f1b3c..59fb43caee72 100644
--- a/sw/inc/SwRewriter.hxx
+++ b/sw/inc/SwRewriter.hxx
@@ -22,7 +22,7 @@
 
 #include <vector>
 #include <rtl/ustring.hxx>
-#include <swdllapi.h>
+#include "swdllapi.h"
 
 enum SwUndoArg
 {
diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx
index 138e855030c4..2ed5d2cdd08c 100644
--- a/sw/inc/SwStyleNameMapper.hxx
+++ b/sw/inc/SwStyleNameMapper.hxx
@@ -21,7 +21,7 @@
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
-#include <SwGetPoolIdFromName.hxx>
+#include "SwGetPoolIdFromName.hxx"
 #include "swdllapi.h"
 
 #include <unordered_map>
diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx
index d652e748416c..e9ef5d8dcb38 100644
--- a/sw/inc/SwUndoField.hxx
+++ b/sw/inc/SwUndoField.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_SWUNDOFIELD_HXX
 #define INCLUDED_SW_INC_SWUNDOFIELD_HXX
 
-#include <undobj.hxx>
+#include "undobj.hxx"
 
 #include <com/sun/star/uno/Any.h>
 
diff --git a/sw/inc/ToxLinkProcessor.hxx b/sw/inc/ToxLinkProcessor.hxx
index 78bb7fb30d49..e53c537b758e 100644
--- a/sw/inc/ToxLinkProcessor.hxx
+++ b/sw/inc/ToxLinkProcessor.hxx
@@ -11,7 +11,7 @@
 #define SW_TOXLINKPROCESSOR_HXX_
 
 #include "fmtinfmt.hxx"
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 
 #include <memory>
 #include <vector>
diff --git a/sw/inc/ToxTabStopTokenHandler.hxx b/sw/inc/ToxTabStopTokenHandler.hxx
index 9fb7fb6dfc36..0f16033bfe6e 100644
--- a/sw/inc/ToxTabStopTokenHandler.hxx
+++ b/sw/inc/ToxTabStopTokenHandler.hxx
@@ -12,9 +12,9 @@
 #define TOXTABSTOPTOKENHANDLER_HXX_
 
 #include "swdllapi.h"
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 
-#include "editeng/tstpitem.hxx"
+#include <editeng/tstpitem.hxx>
 
 struct SwFormToken;
 class SwPageDesc;
diff --git a/sw/inc/ToxTextGenerator.hxx b/sw/inc/ToxTextGenerator.hxx
index 70155e73b0a9..78de181df56d 100644
--- a/sw/inc/ToxTextGenerator.hxx
+++ b/sw/inc/ToxTextGenerator.hxx
@@ -20,8 +20,8 @@
 #ifndef SW_TOXTEXTGENERATOR_HXX_
 #define SW_TOXTEXTGENERATOR_HXX_
 
-#include "rtl/ustring.hxx"
-#include "sal/types.h"
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 #include "swdllapi.h"
 
 #include <memory>
diff --git a/sw/inc/ToxWhitespaceStripper.hxx b/sw/inc/ToxWhitespaceStripper.hxx
index 835ed8ae87fe..bbe261312301 100644
--- a/sw/inc/ToxWhitespaceStripper.hxx
+++ b/sw/inc/ToxWhitespaceStripper.hxx
@@ -11,8 +11,8 @@
 #ifndef TOXWHITESPACESTRIPPER_HXX_
 #define TOXWHITESPACESTRIPPER_HXX_
 
-#include "rtl/ustring.hxx"
-#include <swdllapi.h>
+#include <rtl/ustring.hxx>
+#include "swdllapi.h"
 #include <vector>
 
 namespace sw {
diff --git a/sw/inc/UndoParagraphSignature.hxx b/sw/inc/UndoParagraphSignature.hxx
index 8481c23dd030..763a25d1ba6e 100644
--- a/sw/inc/UndoParagraphSignature.hxx
+++ b/sw/inc/UndoParagraphSignature.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_UNDOPARAGRAPHSIGNATURE_HXX
 #define INCLUDED_SW_INC_UNDOPARAGRAPHSIGNATURE_HXX
 
-#include <undobj.hxx>
+#include "undobj.hxx"
 #include <rtl/ustring.hxx>
 
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index bc52043255a0..46318fda434a 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SW_INC_ANCHOREDDRAWOBJECT_HXX
 
 #include <memory>
-#include <anchoredobject.hxx>
+#include "anchoredobject.hxx"
 
 namespace tools { class Rectangle; }
 
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index 9f0687f864ca..554fc6721902 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_SW_INC_ANCHOREDOBJECT_HXX
 #define INCLUDED_SW_INC_ANCHOREDOBJECT_HXX
 
-#include <swtypes.hxx>
-#include <swrect.hxx>
+#include "swtypes.hxx"
+#include "swrect.hxx"
 #include <libxml/xmlwriter.h>
 
 class SdrObject;
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index 653e43f96e6a..65a0327c18cb 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -20,8 +20,8 @@
 #define INCLUDED_SW_INC_AUTHFLD_HXX
 
 #include "swdllapi.h"
-#include <fldbas.hxx>
-#include <toxe.hxx>
+#include "fldbas.hxx"
+#include "toxe.hxx"
 #include <sal/log.hxx>
 
 #include <memory>
diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx
index 5c56f3aa81d9..f213dc7b5a5b 100644
--- a/sw/inc/bparr.hxx
+++ b/sw/inc/bparr.hxx
@@ -23,7 +23,7 @@
 #include <assert.h>
 
 #include <tools/solar.h>
-#include <swdllapi.h>
+#include "swdllapi.h"
 #include <array>
 #include <memory>
 
diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index 1c6f9d5c7dbd..4b0017a79a13 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/i18n/XScriptTypeDetector.hpp>
 #include <com/sun/star/i18n/ForbiddenCharacters.hpp>
 #include <i18nlangtag/languagetag.hxx>
-#include <swdllapi.h>
+#include "swdllapi.h"
 
 enum class SvtScriptType;
 
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 9830080f703c..38d2e94b4261 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -21,9 +21,9 @@
 #define INCLUDED_SW_INC_CALBCK_HXX
 
 #include "swdllapi.h"
-#include <ring.hxx>
-#include <hintids.hxx>
-#include <hints.hxx>
+#include "ring.hxx"
+#include "hintids.hxx"
+#include "hints.hxx"
 #include <typeinfo>
 #include <type_traits>
 
diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index 5dd029a4f073..ebc3f7de8892 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_SW_INC_CHARATR_HXX
 #define INCLUDED_SW_INC_CHARATR_HXX
 
-#include <format.hxx>
-#include <hintids.hxx>
+#include "format.hxx"
+#include "hintids.hxx"
 #include <editeng/postitem.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/shdditem.hxx>
diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx
index 7d5ad9c27479..c6e61d2de1bc 100644
--- a/sw/inc/charfmt.hxx
+++ b/sw/inc/charfmt.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_CHARFMT_HXX
 #define INCLUDED_SW_INC_CHARFMT_HXX
 
-#include <format.hxx>
+#include "format.hxx"
 
 class SW_DLLPUBLIC SwCharFormat : public SwFormat
 {
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 382af16246b8..f321d1851f21 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -21,7 +21,7 @@
 #define INCLUDED_SW_INC_CMDID_H
 
 #include <sfx2/sfxsids.hrc>
-#include <unomid.h>
+#include "unomid.h"
 
 #define FN_FILE                 SID_SW_START
 #define FN_EDIT                 (SID_SW_START +  100)
diff --git a/sw/inc/cnttab.hrc b/sw/inc/cnttab.hrc
index e593e3c3fb13..70eefcdac564 100644
--- a/sw/inc/cnttab.hrc
+++ b/sw/inc/cnttab.hrc
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_INC_CNTTAB_HRC
 #define INCLUDED_SW_INC_CNTTAB_HRC
 
-#include <tox.hxx>
+#include "tox.hxx"
 
 #define NC_(Context, String) (Context "\004" u8##String)
 
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index efc5402e5cf1..fd75609f057f 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -26,19 +26,19 @@
 #include <vcl/keycod.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
-#include <IShellCursorSupplier.hxx>
+#include "IShellCursorSupplier.hxx"
 #include "swdllapi.h"
-#include <docary.hxx>
-#include <swtypes.hxx>
-#include <viewsh.hxx>
-#include <calbck.hxx>
-#include <cshtyp.hxx>
-#include <crstate.hxx>
-#include <toxe.hxx>
-#include <tblsel.hxx>
-#include <viscrs.hxx>
-#include <node.hxx>
-#include <IDocumentMarkAccess.hxx>
+#include "docary.hxx"
+#include "swtypes.hxx"
+#include "viewsh.hxx"
+#include "calbck.hxx"
+#include "cshtyp.hxx"
+#include "crstate.hxx"
+#include "toxe.hxx"
+#include "tblsel.hxx"
+#include "viscrs.hxx"
+#include "node.hxx"
+#include "IDocumentMarkAccess.hxx"
 
 class SfxItemSet;
 class SfxPoolItem;
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index 71a3a7868dcb..594757be3b76 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -21,8 +21,8 @@
 
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <tools/gen.hxx>
-#include <swtypes.hxx>
-#include <swrect.hxx>
+#include "swtypes.hxx"
+#include "swrect.hxx"
 
 enum SwFillMode
 {
diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx
index e8aa8f605245..44dc0b2ab6ce 100644
--- a/sw/inc/dbgoutsw.hxx
+++ b/sw/inc/dbgoutsw.hxx
@@ -22,7 +22,7 @@
 #ifdef DBG_UTIL
 
 #include <rtl/ustring.hxx>
-#include <tox.hxx>
+#include "tox.hxx"
 #include <cstdio>
 #include <unordered_map>
 
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 892bf3ad648b..c78907987266 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -24,7 +24,7 @@
 #include <i18nlangtag/lang.h>
 #include <com/sun/star/util/Date.hpp>
 #include "swdllapi.h"
-#include <swdbdata.hxx>
+#include "swdbdata.hxx"
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/lang/Locale.hpp>
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index d91c1cccfc0b..451064a6010b 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -21,15 +21,15 @@
 
 #include <svx/svdobj.hxx>
 #include <svx/svdovirt.hxx>
-#include <swtypes.hxx>
-#include <fmtanchr.hxx>
-#include <frmfmt.hxx>
+#include "swtypes.hxx"
+#include "fmtanchr.hxx"
+#include "frmfmt.hxx"
 #include <list>
 #include <vector>
 #include <memory>
 
 #include "calbck.hxx"
-#include <anchoreddrawobject.hxx>
+#include "anchoreddrawobject.hxx"
 
 class SfxPoolItem;
 class SwFrameFormat;
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 92ee440db7e8..5698a92ceb69 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -20,20 +20,20 @@
 #define INCLUDED_SW_INC_DOC_HXX
 
 // SwDoc interfaces
-#include <IDocumentMarkAccess.hxx>
+#include "IDocumentMarkAccess.hxx"
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
 #include <sal/macros.h>
 #include "swdllapi.h"
-#include <swtypes.hxx>
-#include <swatrset.hxx>
-#include <toxe.hxx>
-#include <flyenum.hxx>
-#include <flypos.hxx>
-#include <itabenum.hxx>
-#include <swdbdata.hxx>
+#include "swtypes.hxx"
+#include "swatrset.hxx"
+#include "toxe.hxx"
+#include "flyenum.hxx"
+#include "flypos.hxx"
+#include "itabenum.hxx"
+#include "swdbdata.hxx"
 #include <com/sun/star/linguistic2/XSpellChecker1.hpp>
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 #include <sfx2/objsh.hxx>
@@ -41,11 +41,11 @@
 #include <editeng/numitem.hxx>
 #include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
 #include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
-#include <tox.hxx>
-#include <frmfmt.hxx>
-#include <charfmt.hxx>
-#include <docary.hxx>
-#include <pagedesc.hxx>
+#include "tox.hxx"
+#include "frmfmt.hxx"
+#include "charfmt.hxx"
+#include "docary.hxx"
+#include "pagedesc.hxx"
 #include "tblenum.hxx"
 
 #include <svtools/embedhlp.hxx>
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 8e89c8f528b9..932c31f327e8 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -33,15 +33,15 @@
 #include <boost/multi_index/ordered_index.hpp>
 #include <boost/multi_index/random_access_index.hpp>
 
-#include <swtypes.hxx>
-#include <ndarr.hxx>
-#include <charfmt.hxx>
-#include <fmtcol.hxx>
-#include <frmfmt.hxx>
-#include <section.hxx>
-#include <fldbas.hxx>
-#include <tox.hxx>
-#include <numrule.hxx>
+#include "swtypes.hxx"
+#include "ndarr.hxx"
+#include "charfmt.hxx"
+#include "fmtcol.hxx"
+#include "frmfmt.hxx"
+#include "section.hxx"
+#include "fldbas.hxx"
+#include "tox.hxx"
+#include "numrule.hxx"
 
 class SwRangeRedline;
 class SwExtraRedline;
diff --git a/sw/inc/docfac.hxx b/sw/inc/docfac.hxx
index 5f166394fe6a..df8f298bb969 100644
--- a/sw/inc/docfac.hxx
+++ b/sw/inc/docfac.hxx
@@ -22,7 +22,7 @@
 #include <tools/solar.h>
 #include <rtl/ref.hxx>
 
-#include <doc.hxx>
+#include "doc.hxx"
 
 class SW_DLLPUBLIC SwDocFac
 {
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index d917b6a5780b..6829837d91cf 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -26,7 +26,7 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/objsh.hxx>
 #include "swdllapi.h"
-#include <shellid.hxx>
+#include "shellid.hxx"
 
 #include <svl/lstner.hxx>
 #include <svtools/embedhlp.hxx>
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 9b9692b4c47e..7a74b987e3e7 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -19,18 +19,18 @@
 #ifndef INCLUDED_SW_INC_EDITSH_HXX
 #define INCLUDED_SW_INC_EDITSH_HXX
 
-#include <crsrsh.hxx>
-
-#include <IMark.hxx>
-#include <charfmt.hxx>
-#include <fldupde.hxx>
-#include <frmfmt.hxx>
-#include <itabenum.hxx>
-#include <swdbdata.hxx>
-#include <swdllapi.h>
-#include <swundo.hxx>
-#include <tblenum.hxx>
-#include <tox.hxx>
+#include "crsrsh.hxx"
+
+#include "IMark.hxx"
+#include "charfmt.hxx"
+#include "fldupde.hxx"
+#include "frmfmt.hxx"
+#include "itabenum.hxx"
+#include "swdbdata.hxx"
+#include "swdllapi.h"
+#include "swundo.hxx"
+#include "tblenum.hxx"
+#include "tox.hxx"
 #include <svtools/embedhlp.hxx>
 
 #include <editeng/swafopt.hxx>
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index a74734191cb5..93926c8a7ec5 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -20,8 +20,8 @@
 #define INCLUDED_SW_INC_EXPFLD_HXX
 
 #include "swdllapi.h"
-#include <fldbas.hxx>
-#include <cellfml.hxx>
+#include "fldbas.hxx"
+#include "cellfml.hxx"
 #include <set>
 #include <memory>
 #include <vector>
diff --git a/sw/inc/extinput.hxx b/sw/inc/extinput.hxx
index de253f8f5a29..262471bf2711 100644
--- a/sw/inc/extinput.hxx
+++ b/sw/inc/extinput.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_EXTINPUT_HXX
 #define INCLUDED_SW_INC_EXTINPUT_HXX
 
-#include <pam.hxx>
+#include "pam.hxx"
 #include <i18nlangtag/lang.h>
 #include <vector>
 
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index 03d1692115c1..c42ba44fbcd0 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -20,9 +20,9 @@
 #define INCLUDED_SW_INC_FCHRFMT_HXX
 
 #include <svl/poolitem.hxx>
-#include <calbck.hxx>
-#include <format.hxx>
-#include <charfmt.hxx>
+#include "calbck.hxx"
+#include "format.hxx"
+#include "charfmt.hxx"
 
 class SwTextCharFormat;
 class IntlWrapper;
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 1141a4ea9812..db61f9a2d44a 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -25,8 +25,8 @@
 
 #include <svx/svdobj.hxx>
 #include "swdllapi.h"
-#include <editsh.hxx>
-#include <flyenum.hxx>
+#include "editsh.hxx"
+#include "flyenum.hxx"
 
 #include <svx/svdtypes.hxx>
 #include <sot/formats.hxx>
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index f8030874a782..9cbf76256998 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -21,13 +21,13 @@
 
 #include <i18nlangtag/lang.h>
 #include "swdllapi.h"
-#include <calbck.hxx>
+#include "calbck.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <editeng/svxenum.hxx>
 #include <vector>
-#include <toxe.hxx>
+#include "toxe.hxx"
 
 class SwDoc;
 class SvNumberFormatter;
diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx
index f4bcdfb58ad3..5d00fdab4c59 100644
--- a/sw/inc/flypos.hxx
+++ b/sw/inc/flypos.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_FLYPOS_HXX
 #define INCLUDED_SW_INC_FLYPOS_HXX
 
-#include <swdllapi.h>
+#include "swdllapi.h"
 #include <memory>
 #include <set>
 
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index 3f92bede38a2..28361a7ac7cf 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -20,9 +20,9 @@
 #define INCLUDED_SW_INC_FMTANCHR_HXX
 
 #include "swdllapi.h"
-#include <hintids.hxx>
-#include <swtypes.hxx>
-#include <format.hxx>
+#include "hintids.hxx"
+#include "swtypes.hxx"
+#include "format.hxx"
 #include <svl/poolitem.hxx>
 
 #include <memory>
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index 566fc384788c..2d82ca27cc8d 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SW_INC_FMTAUTOFMT_HXX
 
 #include <svl/poolitem.hxx>
-#include <format.hxx>
+#include "format.hxx"
 #include <memory>
 
 class SwFormatAutoFormat: public SfxPoolItem
diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx
index 4f74fdca1889..cf41b339f938 100644
--- a/sw/inc/fmtclbl.hxx
+++ b/sw/inc/fmtclbl.hxx
@@ -20,8 +20,8 @@
 #define INCLUDED_SW_INC_FMTCLBL_HXX
 
 #include <svl/eitem.hxx>
-#include <hintids.hxx>
-#include <format.hxx>
+#include "hintids.hxx"
+#include "format.hxx"
 #include "swdllapi.h"
 
 /// If text in multi-column sections should be evenly distributed.
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index 43a853f1519a..9e94196729fb 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -23,8 +23,8 @@
 #include <tools/color.hxx>
 #include <svl/poolitem.hxx>
 #include "swdllapi.h"
-#include <hintids.hxx>
-#include <format.hxx>
+#include "hintids.hxx"
+#include "format.hxx"
 
 #include <vector>
 
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index 5da8d3c87d01..c95e87cc10e2 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.hxx
@@ -19,11 +19,11 @@
 #ifndef INCLUDED_SW_INC_FMTCNCT_HXX
 #define INCLUDED_SW_INC_FMTCNCT_HXX
 
-#include <hintids.hxx>
+#include "hintids.hxx"
 #include <svl/poolitem.hxx>
-#include <format.hxx>
-#include <calbck.hxx>
-#include <frmfmt.hxx>
+#include "format.hxx"
+#include "calbck.hxx"
+#include "frmfmt.hxx"
 
 class IntlWrapper;
 
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index 032fe31c34ba..8fcdae13542b 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -21,8 +21,8 @@
 
 #include <memory>
 #include <svl/poolitem.hxx>
-#include <hintids.hxx>
-#include <format.hxx>
+#include "hintids.hxx"
+#include "format.hxx"
 
 class SwNodeIndex;
 class SwStartNode;
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 35984ebe90bb..80172c827de4 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -20,8 +20,8 @@
 #define INCLUDED_SW_INC_FMTCOL_HXX
 
 #include "swdllapi.h"
-#include <frmatr.hxx>
-#include <swtypes.hxx>
+#include "frmatr.hxx"
+#include "swtypes.hxx"
 #include <rtl/ustring.hxx>
 
 #include <vector>
diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx
index 4c91bd16a080..8ea4e9964d7c 100644
--- a/sw/inc/fmteiro.hxx
+++ b/sw/inc/fmteiro.hxx
@@ -20,8 +20,8 @@
 #define INCLUDED_SW_INC_FMTEIRO_HXX
 
 #include <svl/eitem.hxx>
-#include <hintids.hxx>
-#include <format.hxx>
+#include "hintids.hxx"
+#include "format.hxx"
 #include "swdllapi.h"
 
 class IntlWrapper;
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 86f114fd7fb3..39c41d55b33e 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -27,7 +27,7 @@
 #include <svl/SfxBroadcaster.hxx>
 
 #include "swdllapi.h"
-#include <calbck.hxx>
+#include "calbck.hxx"
 
 class SwField;
 class SwTextField;
diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index a259c9ba9ff7..7686edfeccd2 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -20,8 +20,8 @@
 #define INCLUDED_SW_INC_FMTFOLLOWTEXTFLOW_HXX
 
 #include <svl/eitem.hxx>
-#include <hintids.hxx>
-#include <format.hxx>
+#include "hintids.hxx"
+#include "format.hxx"
 #include "swdllapi.h"
 
 class IntlWrapper;
diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx
index eec6343dbd1f..20b80d1d4b90 100644
--- a/sw/inc/fmtfordr.hxx
+++ b/sw/inc/fmtfordr.hxx
@@ -20,8 +20,8 @@
 #define INCLUDED_SW_INC_FMTFORDR_HXX
 
 #include <svl/eitem.hxx>
-#include <hintids.hxx>
-#include <format.hxx>
+#include "hintids.hxx"
+#include "format.hxx"
 
 enum SwFillOrder
 {
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index 4bb829c01b71..94edec0814ce 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -22,9 +22,9 @@
 #include <tools/gen.hxx>
 #include <svl/poolitem.hxx>
 #include "swdllapi.h"
-#include <hintids.hxx>
-#include <swtypes.hxx>
-#include <format.hxx>
+#include "hintids.hxx"
+#include "swtypes.hxx"
+#include "format.hxx"
 
 class IntlWrapper;
 
diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx
index 4a4a3deef3b2..ee22d3b8bc52 100644
--- a/sw/inc/fmtftn.hxx
+++ b/sw/inc/fmtftn.hxx
@@ -24,7 +24,7 @@
 #include <svl/poolitem.hxx>
 
 #include "swdllapi.h"
-#include <calbck.hxx>
+#include "calbck.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace text { class XFootnote; }
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index 40dcae1bcd1c..36e0fbfe2da3 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -20,9 +20,9 @@
 #define INCLUDED_SW_INC_FMTFTNTX_HXX
 
 #include <svl/eitem.hxx>
-#include <hintids.hxx>
-#include <format.hxx>
-#include <numrule.hxx>
+#include "hintids.hxx"
+#include "format.hxx"
+#include "numrule.hxx"
 #include "swdllapi.h"
 
 enum SwFootnoteEndPosEnum
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index 59d999a421f5..0c0804fa1d04 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -19,11 +19,11 @@
 #ifndef INCLUDED_SW_INC_FMTHDFT_HXX
 #define INCLUDED_SW_INC_FMTHDFT_HXX
 
-#include <hintids.hxx>
-#include <format.hxx>
+#include "hintids.hxx"
+#include "format.hxx"
 #include <svl/poolitem.hxx>
-#include <calbck.hxx>
-#include <frmfmt.hxx>
+#include "calbck.hxx"
+#include "frmfmt.hxx"
 
 class IntlWrapper;
 class SwFormat;
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index fac0c269b6b4..523442f6c677 100644
--- a/sw/inc/fmtline.hxx
+++ b/sw/inc/fmtline.hxx
@@ -20,8 +20,8 @@
 #define INCLUDED_SW_INC_FMTLINE_HXX
 
 #include <svl/poolitem.hxx>
-#include <hintids.hxx>
-#include <format.hxx>
+#include "hintids.hxx"
+#include "format.hxx"
 #include "swdllapi.h"
 
 class IntlWrapper;
diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx
index 0a6524804073..85f10adadf00 100644
--- a/sw/inc/fmtlsplt.hxx
+++ b/sw/inc/fmtlsplt.hxx
@@ -20,8 +20,8 @@
 #define INCLUDED_SW_INC_FMTLSPLT_HXX
 
 #include <svl/eitem.hxx>
-#include <hintids.hxx>
-#include <format.hxx>
+#include "hintids.hxx"
+#include "format.hxx"
 #include "swdllapi.h"
 
 class IntlWrapper;
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index 7dbd5889d1ad..8b8c3173afde 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -23,9 +23,9 @@
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
 #include "swdllapi.h"
-#include <hintids.hxx>
-#include <swtypes.hxx>
-#include <format.hxx>
+#include "hintids.hxx"
+#include "swtypes.hxx"
+#include "format.hxx"
 #include <svl/poolitem.hxx>
 
 class IntlWrapper;
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index 12fc58467676..1d39f7b0343f 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.hxx
@@ -21,11 +21,11 @@
 
 #include <svl/poolitem.hxx>
 #include "swdllapi.h"
-#include <hintids.hxx>
-#include <format.hxx>
-#include <calbck.hxx>
+#include "hintids.hxx"
+#include "format.hxx"
+#include "calbck.hxx"
 #include <boost/optional.hpp>
-#include <pagedesc.hxx>
+#include "pagedesc.hxx"
 
 class SwPageDesc;
 class SwHistory;
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index 494f4d187bde..9248e7353f84 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -23,7 +23,7 @@
 #include <cppuhelper/weakref.hxx>
 #include <svl/poolitem.hxx>
 
-#include <calbck.hxx>
+#include "calbck.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace text { class XTextContent; }
diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx
index c045cea1b9b2..a17809b0c604 100644
--- a/sw/inc/fmtrowsplt.hxx
+++ b/sw/inc/fmtrowsplt.hxx
@@ -21,8 +21,8 @@
 
 #include <svl/eitem.hxx>
 #include "swdllapi.h"
-#include <hintids.hxx>
-#include <format.hxx>
+#include "hintids.hxx"
+#include "format.hxx"
 
 class IntlWrapper;
 
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index e8b30f518a4d..bb491b0266c8 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.hxx
@@ -21,8 +21,8 @@
 
 #include "swdllapi.h"
 #include <com/sun/star/text/WrapTextMode.hpp>
-#include <hintids.hxx>
-#include <format.hxx>
+#include "hintids.hxx"
+#include "format.hxx"
 #include <svl/eitem.hxx>
 
 class IntlWrapper;
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index 371ce466e2ea..3a0ea0ba8e16 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -22,8 +22,8 @@
 #include <memory>
 #include <svl/poolitem.hxx>
 #include "swdllapi.h"
-#include <hintids.hxx>
-#include <format.hxx>
+#include "hintids.hxx"
+#include "format.hxx"
 
 class ImageMap;
 class IntlWrapper;
diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx
index a4cc9201ba5a..516f2f329a05 100644
--- a/sw/inc/fmtwrapinfluenceonobjpos.hxx
+++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_SW_INC_FMTWRAPINFLUENCEONOBJPOS_HXX
 #define INCLUDED_SW_INC_FMTWRAPINFLUENCEONOBJPOS_HXX
 
-#include <hintids.hxx>
-#include <format.hxx>
+#include "hintids.hxx"
+#include "format.hxx"
 #include <svl/poolitem.hxx>
 #include <com/sun/star/text/WrapInfluenceOnPosition.hpp>
 
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 42bddf7b44bc..071d22a2257c 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -21,9 +21,9 @@
 
 #include <tools/solar.h>
 #include "swdllapi.h"
-#include <swatrset.hxx>
-#include <calbck.hxx>
-#include <hintids.hxx>
+#include "swatrset.hxx"
+#include "calbck.hxx"
+#include "hintids.hxx"
 #include <memory>
 
 class IDocumentSettingAccess;
diff --git a/sw/inc/frmatr.hxx b/sw/inc/frmatr.hxx
index d24eb57b8927..02a1188c711c 100644
--- a/sw/inc/frmatr.hxx
+++ b/sw/inc/frmatr.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_SW_INC_FRMATR_HXX
 #define INCLUDED_SW_INC_FRMATR_HXX
 
-#include <hintids.hxx>
-#include <format.hxx>
+#include "hintids.hxx"
+#include "format.hxx"
 #include <editeng/pbinitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/ulspitem.hxx>
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index be17d8355497..e90b808df8dd 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/text/PositionLayoutDir.hpp>
 #include <cppuhelper/weakref.hxx>
 #include <tools/gen.hxx>
-#include <format.hxx>
+#include "format.hxx"
 #include "swdllapi.h"
 #include <list>
 
diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx
index df00db048c32..eeeb39e1129d 100644
--- a/sw/inc/ftninfo.hxx
+++ b/sw/inc/ftninfo.hxx
@@ -21,9 +21,9 @@
 
 #include <rtl/ustring.hxx>
 #include "swdllapi.h"
-#include <calbck.hxx>
+#include "calbck.hxx"
 #include <editeng/numitem.hxx>
-#include <fmtcol.hxx>
+#include "fmtcol.hxx"
 
 class SwTextFormatColl;
 class SwPageDesc;
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index af5d606f4498..b05c11b4dff9 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -19,15 +19,15 @@
 #ifndef INCLUDED_SW_INC_GRFATR_HXX
 #define INCLUDED_SW_INC_GRFATR_HXX
 
-#include <hintids.hxx>
+#include "hintids.hxx"
 #include <tools/gen.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include <svtools/grfmgr.hxx>
 #include <svx/grfcrop.hxx>
 #include "swdllapi.h"
-#include <swatrset.hxx>
-#include <format.hxx>
+#include "swatrset.hxx"
+#include "format.hxx"
 
 enum class MirrorGraph
 {
diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx
index 5e7df9eb234f..ec850a13bb46 100644
--- a/sw/inc/hfspacingitem.hxx
+++ b/sw/inc/hfspacingitem.hxx
@@ -20,8 +20,8 @@
 #define INCLUDED_SW_INC_HFSPACINGITEM_HXX
 
 #include <svl/eitem.hxx>
-#include <hintids.hxx>
-#include <format.hxx>
+#include "hintids.hxx"
+#include "format.hxx"
 
 class IntlWrapper;
 
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index 1e5049bf8a0a..06904cbd311f 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_SW_INC_HINTS_HXX
 #define INCLUDED_SW_INC_HINTS_HXX
 
-#include <swatrset.hxx>
-#include <swtypes.hxx>
+#include "swatrset.hxx"
+#include "swtypes.hxx"
 #include <vcl/vclptr.hxx>
 #include <vector>
 
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index 84320219cd07..10256ad1f53f 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SW_INC_INDEX_HXX
 
 #include <sal/types.h>
-#include <swdllapi.h>
+#include "swdllapi.h"
 
 #include <iostream>
 
diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx
index a92ad13d3221..8bc4655bc8ad 100644
--- a/sw/inc/iodetect.hxx
+++ b/sw/inc/iodetect.hxx
@@ -25,7 +25,7 @@
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <swdllapi.h>
+#include "swdllapi.h"
 
 #define FILTER_RTF      "RTF"       ///< RTF filter
 #define sRtfWH          "WH_RTF"
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index 924d44a2f750..c27afef21026 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -21,8 +21,8 @@
 
 #include <rtl/ustring.hxx>
 #include <tools/solar.h>
-#include <tblenum.hxx>
-#include <swdllapi.h>
+#include "tblenum.hxx"
+#include "swdllapi.h"
 
 class SwRect;
 class Size;
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index 875a6aebd6ef..2091957eedf4 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -24,7 +24,7 @@
 #include <unotools/configitem.hxx>
 #include "swdllapi.h"
 #include "authratr.hxx"
-#include <SwCapObjType.hxx>
+#include "SwCapObjType.hxx"
 #include "tblenum.hxx"
 #include "itabenum.hxx"
 #include <tools/globname.hxx>
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index ecb4432bdd76..80270f209f08 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -30,10 +30,10 @@
 
 #include <svtools/embedhlp.hxx>
 
-#include <bparr.hxx>
-#include <ndtyp.hxx>
+#include "bparr.hxx"
+#include "ndtyp.hxx"
 #include <o3tl/sorted_vector.hxx>
-#include <ring.hxx>
+#include "ring.hxx"
 
 class Graphic;
 class GraphicObject;
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 4676395dfae3..5d465d76d2d1 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SW_INC_NDGRF_HXX
 #include <sfx2/lnkbase.hxx>
 #include <svtools/grfmgr.hxx>
-#include <ndnotxt.hxx>
+#include "ndnotxt.hxx"
 #include <com/sun/star/embed/XStorage.hpp>
 #include <memory>
 class SwAsyncRetrieveInputStreamThreadConsumer;
diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx
index 51c716d85a5a..67bfc47c5342 100644
--- a/sw/inc/ndindex.hxx
+++ b/sw/inc/ndindex.hxx
@@ -24,9 +24,9 @@
 
 #include <tools/solar.h>
 
-#include <node.hxx>
-#include <ring.hxx>
-#include <ndarr.hxx>
+#include "node.hxx"
+#include "ring.hxx"
+#include "ndarr.hxx"
 
 class SwNode;
 class SwNodes;
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index 94ec0131158f..13e32c2b3580 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_NDOLE_HXX
 #define INCLUDED_SW_INC_NDOLE_HXX
 
-#include <ndnotxt.hxx>
+#include "ndnotxt.hxx"
 #include <svtools/embedhlp.hxx>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <rtl/ref.hxx>
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index c3c08e240652..1992227207b5 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -22,12 +22,12 @@
 #include <cppuhelper/weakref.hxx>
 
 #include "swdllapi.h"
-#include <node.hxx>
-#include <hintids.hxx>
-#include <ndhints.hxx>
-#include <modeltoviewhelper.hxx>
-#include <SwNumberTreeTypes.hxx>
-#include <IDocumentContentOperations.hxx>
+#include "node.hxx"
+#include "hintids.hxx"
+#include "ndhints.hxx"
+#include "modeltoviewhelper.hxx"
+#include "SwNumberTreeTypes.hxx"
+#include "IDocumentContentOperations.hxx"
 
 #include <sfx2/Metadatable.hxx>
 
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 632ae629336e..75760c18859b 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -24,10 +24,10 @@
 #include <tools/mempool.hxx>
 
 #include "swdllapi.h"
-#include <ndarr.hxx>
-#include <ndtyp.hxx>
-#include <index.hxx>
-#include <fmtcol.hxx>
+#include "ndarr.hxx"
+#include "ndtyp.hxx"
+#include "index.hxx"
+#include "fmtcol.hxx"
 
 #include <memory>
 #include <vector>
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index dbe4290bad26..560a655f055a 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -24,15 +24,15 @@
 #include <editeng/svxenum.hxx>
 #include <editeng/numitem.hxx>
 #include "swdllapi.h"
-#include <swtypes.hxx>
-#include <calbck.hxx>
-#include <hints.hxx>
-#include <SwNumberTreeTypes.hxx>
-#include <ndarr.hxx>
+#include "swtypes.hxx"
+#include "calbck.hxx"
+#include "hints.hxx"
+#include "SwNumberTreeTypes.hxx"
+#include "ndarr.hxx"
 #include <unordered_map>
 #include <memory>
 #include <vector>
-#include <charfmt.hxx>
+#include "charfmt.hxx"
 
 class SwTextFormatColl;
 class IDocumentListsAccess;
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 49ac0c92d8ad..8aae903f9f99 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -22,8 +22,8 @@
 #include <tools/fract.hxx>
 #include <tools/color.hxx>
 #include "swdllapi.h"
-#include <swtypes.hxx>
-#include <frmfmt.hxx>
+#include "swtypes.hxx"
+#include "frmfmt.hxx"
 #include <editeng/numitem.hxx>
 #include <editeng/borderline.hxx>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx
index 13c53f4f7b39..810ca1e8cc22 100644
--- a/sw/inc/pagepreviewlayout.hxx
+++ b/sw/inc/pagepreviewlayout.hxx
@@ -27,7 +27,7 @@
 // classes <Point>, <Size> and <Rectangle>
 #include <tools/gen.hxx>
 // datatype <SwTwips>
-#include <swtypes.hxx>
+#include "swtypes.hxx"
 
 class SwViewShell;
 class SwRootFrame;
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 7bda3a7cbe9a..bdd23ecfa2df 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -22,10 +22,10 @@
 #include <stddef.h>
 #include <sal/types.h>
 #include <tools/mempool.hxx>
-#include <cshtyp.hxx>
-#include <ring.hxx>
-#include <index.hxx>
-#include <ndindex.hxx>
+#include "cshtyp.hxx"
+#include "ring.hxx"
+#include "index.hxx"
+#include "ndindex.hxx"
 #include "swdllapi.h"
 
 #include <iostream>
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 8bdb8eef7410..a803b924d39f 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -21,12 +21,12 @@
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
 #include "swdllapi.h"
-#include <hintids.hxx>
-#include <calbck.hxx>
-#include <swatrset.hxx>
-#include <format.hxx>
-#include <charfmt.hxx>
-#include <swtypes.hxx>
+#include "hintids.hxx"
+#include "calbck.hxx"
+#include "swatrset.hxx"
+#include "format.hxx"
+#include "charfmt.hxx"
+#include "swtypes.hxx"
 #include <editeng/adjustitem.hxx>
 #include <editeng/lspcitem.hxx>
 #include <editeng/spltitem.hxx>
diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx
index 483fbbd8f74a..982faa671569 100644
--- a/sw/inc/postithelper.hxx
+++ b/sw/inc/postithelper.hxx
@@ -19,13 +19,13 @@
 #ifndef INCLUDED_SW_INC_POSTITHELPER_HXX
 #define INCLUDED_SW_INC_POSTITHELPER_HXX
 
-#include <swrect.hxx>
-#include <fmtfld.hxx>
-#include <redline.hxx>
+#include "swrect.hxx"
+#include "fmtfld.hxx"
+#include "redline.hxx"
 #include <cstddef>
 #include <vector>
 #include <vcl/window.hxx>
-#include <SidebarWindowsTypes.hxx>
+#include "SidebarWindowsTypes.hxx"
 
 class SfxBroadcaster;
 class SwRootFrame;
diff --git a/sw/inc/prtopt.hxx b/sw/inc/prtopt.hxx
index d43884e6844a..45eaa167d125 100644
--- a/sw/inc/prtopt.hxx
+++ b/sw/inc/prtopt.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SW_INC_PRTOPT_HXX
 
 #include <unotools/configitem.hxx>
-#include <printdata.hxx>
+#include "printdata.hxx"
 
 class SwPrintOptions : public SwPrintData, public utl::ConfigItem
 {
diff --git a/sw/inc/rdfhelper.hxx b/sw/inc/rdfhelper.hxx
index dccd152d026f..33c10eece3ed 100644
--- a/sw/inc/rdfhelper.hxx
+++ b/sw/inc/rdfhelper.hxx
@@ -14,7 +14,7 @@
 
 #include <rtl/ustring.hxx>
 
-#include <swdllapi.h>
+#include "swdllapi.h"
 
 #include <com/sun/star/uno/Reference.hxx>
 
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 6092b6650056..ae7c37a780ee 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -22,10 +22,10 @@
 #include <tools/datetime.hxx>
 #include <rtl/ustring.hxx>
 
-#include <pam.hxx>
-#include <swtable.hxx>
+#include "pam.hxx"
+#include "swtable.hxx"
 
-#include <IDocumentRedlineAccess.hxx>
+#include "IDocumentRedlineAccess.hxx"
 
 #include <cstddef>
 #include <memory>
diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
index ff9a801f8e06..cbc19e181798 100644
--- a/sw/inc/reffld.hxx
+++ b/sw/inc/reffld.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_REFFLD_HXX
 #define INCLUDED_SW_INC_REFFLD_HXX
 
-#include <fldbas.hxx>
+#include "fldbas.hxx"
 
 class SfxPoolItem;
 class SwDoc;
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index 79a1c93fb82d..191ff3ef7801 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_SW_INC_RING_HXX
 #define INCLUDED_SW_INC_RING_HXX
 
-#include <swdllapi.h>
-#include <swtypes.hxx>
+#include "swdllapi.h"
+#include "swtypes.hxx"
 #include <utility>
 #include <iterator>
 #include <type_traits>
diff --git a/sw/inc/rubylist.hxx b/sw/inc/rubylist.hxx
index bcb7447276a3..9f58b06ac6f0 100644
--- a/sw/inc/rubylist.hxx
+++ b/sw/inc/rubylist.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_SW_INC_RUBYLIST_HXX
 #define INCLUDED_SW_INC_RUBYLIST_HXX
 
-#include <swtypes.hxx>
-#include <fmtruby.hxx>
+#include "swtypes.hxx"
+#include "fmtruby.hxx"
 
 class SwRubyListEntry
 {
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 8c4ee8eee2f7..e2584dc27e11 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -27,7 +27,7 @@
 #include <sfx2/lnkbase.hxx>
 #include <sfx2/Metadatable.hxx>
 
-#include <frmfmt.hxx>
+#include "frmfmt.hxx"
 #include <vector>
 
 namespace com { namespace sun { namespace star {
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index cec8b453e3f4..2b2be71c06b5 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -33,11 +33,11 @@
 #include <tools/datetime.hxx>
 #include <tools/ref.hxx>
 #include <rtl/ref.hxx>
-#include <swdllapi.h>
-#include <swtypes.hxx>
-#include <docfac.hxx>
-#include <iodetect.hxx>
-#include <IMark.hxx>
+#include "swdllapi.h"
+#include "swtypes.hxx"
+#include "docfac.hxx"
+#include "iodetect.hxx"
+#include "IMark.hxx"
 
 class SfxFilterContainer;
 class SfxFilter;
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index afa66c112acb..2885b150e655 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SW_INC_SHELLRES_HXX
 
 #include <memory>
-#include <swdllapi.h>
+#include "swdllapi.h"
 #include <rtl/ustring.hxx>
 #include <vcl/bitmap.hxx>
 
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index c582500ac0b0..ac4918a920ea 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -24,7 +24,7 @@
 #include <sfx2/sfxdlg.hxx>
 #include <svx/svxdlg.hxx>
 #include <vcl/syswin.hxx>
-#include <globals.hrc>
+#include "globals.hrc"
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/frame/XModel.hpp>
@@ -36,7 +36,7 @@
 #include <boost/optional.hpp>
 #include "dbmgr.hxx"
 #include <cnttab.hxx>
-#include <tblenum.hxx>
+#include "tblenum.hxx"
 
 class SfxViewFrame;
 class SfxBindings;
diff --git a/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx
index ce2e9cdb8b1f..08140ffb4d20 100644
--- a/sw/inc/swacorr.hxx
+++ b/sw/inc/swacorr.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/embed/XStorage.hpp>
 
-#include "SwXMLTextBlocks.hxx"
+#include <SwXMLTextBlocks.hxx>
 #include "swdllapi.h"
 
 class SW_DLLPUBLIC SwAutoCorrect : public SvxAutoCorrect
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index ed862c7e9fdd..a6021e5bcac2 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -22,7 +22,7 @@
 #include <tools/mempool.hxx>
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
-#include <swdllapi.h>
+#include "swdllapi.h"
 
 class SwModify;
 class SwDoc;
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 379a88506148..2f8f53c74a81 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -21,9 +21,9 @@
 
 #include <com/sun/star/i18n/WordType.hpp>
 
-#include <pam.hxx>
-#include <tblsel.hxx>
-#include <cshtyp.hxx>
+#include "pam.hxx"
+#include "tblsel.hxx"
+#include "cshtyp.hxx"
 
 struct SwCursor_SavePos;
 namespace i18nutil {
diff --git a/sw/inc/swdll.hxx b/sw/inc/swdll.hxx
index 79b77b664a53..4af803ac0d20 100644
--- a/sw/inc/swdll.hxx
+++ b/sw/inc/swdll.hxx
@@ -21,7 +21,7 @@
 
 #include <sfx2/module.hxx>
 
-#include <swdllapi.h>
+#include "swdllapi.h"
 
 namespace sw { class Filters; }
 
diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx
index 5b58745ddd04..b108d8de9168 100644
--- a/sw/inc/swevent.hxx
+++ b/sw/inc/swevent.hxx
@@ -22,8 +22,8 @@
 
 #include <sfx2/event.hxx>
 #include <tools/solar.h>
-#include <calbck.hxx>
-#include <frmfmt.hxx>
+#include "calbck.hxx"
+#include "frmfmt.hxx"
 
 #define     STR_SW_EVENT_PAGE_COUNT           0
 #define     STR_SW_EVENT_MAIL_MERGE           1
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 9186d4cd9d26..4a7cad8a36c7 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -30,7 +30,7 @@
 
 #include "swdllapi.h"
 #include "shellid.hxx"
-#include <fldupde.hxx>
+#include "fldupde.hxx"
 #include <com/sun/star/linguistic2/XLinguServiceEventListener.hpp>
 #include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
 
diff --git a/sw/inc/swscanner.hxx b/sw/inc/swscanner.hxx
index 40fcfcb9801a..a06f13fe7666 100644
--- a/sw/inc/swscanner.hxx
+++ b/sw/inc/swscanner.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SW_INC_SWSCANNER_HXX
 
 #include <i18nlangtag/lang.h>
-#include <modeltoviewhelper.hxx>
+#include "modeltoviewhelper.hxx"
 
 class SwTextNode;
 
diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx
index 0fa076c208f7..6ccb758d0bfa 100644
--- a/sw/inc/swserv.hxx
+++ b/sw/inc/swserv.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SW_INC_SWSERV_HXX
 
 #include <sfx2/linksrc.hxx>
-#include <IMark.hxx>
+#include "IMark.hxx"
 
 class SwSectionNode;
 class SwBaseLink;
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index f1d62c69ba18..ccdf80e9bced 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -21,11 +21,11 @@
 
 #include <tools/mempool.hxx>
 #include <tools/ref.hxx>
-#include <tblenum.hxx>
-#include <swtypes.hxx>
-#include <calbck.hxx>
-#include <swrect.hxx>
-#include <swtblfmt.hxx>
+#include "tblenum.hxx"
+#include "swtypes.hxx"
+#include "calbck.hxx"
+#include "swrect.hxx"
+#include "swtblfmt.hxx"
 
 #include <memory>
 #include <vector>
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index 6a5765fb9b9f..63f7f3ee46b0 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_SWTBLFMT_HXX
 #define INCLUDED_SW_INC_SWTBLFMT_HXX
 
-#include <frmfmt.hxx>
+#include "frmfmt.hxx"
 
 class SwDoc;
 
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 386941e59eb8..226609ab668e 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -21,7 +21,7 @@
 #include <rtl/ustring.hxx>
 #include <tools/solar.h>
 #include <tools/mapunit.hxx>
-#include <SwGetPoolIdFromName.hxx>
+#include "SwGetPoolIdFromName.hxx"
 
 #include <limits.h>
 #include <com/sun/star/uno/Reference.h>
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index 196f8bc11732..797989fa58b9 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -52,10 +52,10 @@
 #include <svx/rotmodit.hxx>
 #include <svl/intitem.hxx>
 #include <editeng/lineitem.hxx>
-#include <fmtpdsc.hxx>
-#include <fmtlsplt.hxx>
-#include <fmtrowsplt.hxx>
-#include <fmtornt.hxx>
+#include "fmtpdsc.hxx"
+#include "fmtlsplt.hxx"
+#include "fmtrowsplt.hxx"
+#include "fmtornt.hxx"
 #include "swdllapi.h"
 
 struct SwAfVersions;
diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx
index 72057211e3f5..8925733c559c 100644
--- a/sw/inc/tblsel.hxx
+++ b/sw/inc/tblsel.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_SW_INC_TBLSEL_HXX
 #define INCLUDED_SW_INC_TBLSEL_HXX
 
-#include <swtable.hxx>
-#include <swrect.hxx>
+#include "swtable.hxx"
+#include "swrect.hxx"
 #include "swdllapi.h"
 
 #include <o3tl/sorted_vector.hxx>
diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index d8ed926c1bc0..189b7c006c96 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -19,7 +19,7 @@
 #include <com/sun/star/uno/Type.h>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
-#include <swdllapi.h>
+#include "swdllapi.h"
 
 class SdrPage;
 class SdrObject;
diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx
index dc9f3696b383..be7fd137b7ec 100644
--- a/sw/inc/tgrditem.hxx
+++ b/sw/inc/tgrditem.hxx
@@ -22,8 +22,8 @@
 #include <tools/color.hxx>
 #include <svl/poolitem.hxx>
 #include "swdllapi.h"
-#include <hintids.hxx>
-#include <format.hxx>
+#include "hintids.hxx"
+#include "format.hxx"
 
 class IntlWrapper;
 
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index d91332684792..b75eba42de56 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -26,9 +26,9 @@
 #include <svl/poolitem.hxx>
 
 #include <editeng/svxenum.hxx>
-#include <swtypes.hxx>
-#include <toxe.hxx>
-#include <calbck.hxx>
+#include "swtypes.hxx"
+#include "toxe.hxx"
+#include "calbck.hxx"
 #include <o3tl/typed_flags_set.hxx>
 
 #include <vector>
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index 758a72736ae2..9f13ea100d15 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -21,17 +21,17 @@
 
 #include <tools/solar.h>
 #include <svl/poolitem.hxx>
-#include <hintids.hxx>
-#include <fmtautofmt.hxx>
-#include <fmtinfmt.hxx>
-#include <fmtrfmrk.hxx>
-#include <fmtruby.hxx>
-#include <fmtfld.hxx>
-#include <fmtflcnt.hxx>
-#include <fmtftn.hxx>
-#include <fmtmeta.hxx>
-#include <fchrfmt.hxx>
-#include <tox.hxx>
+#include "hintids.hxx"
+#include "fmtautofmt.hxx"
+#include "fmtinfmt.hxx"
+#include "fmtrfmrk.hxx"
+#include "fmtruby.hxx"
+#include "fmtfld.hxx"
+#include "fmtflcnt.hxx"
+#include "fmtftn.hxx"
+#include "fmtmeta.hxx"
+#include "fchrfmt.hxx"
+#include "tox.hxx"
 
 
 class SfxItemPool;
diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx
index 4e82794a4c8d..6827d73191c8 100644
--- a/sw/inc/txatritr.hxx
+++ b/sw/inc/txatritr.hxx
@@ -22,8 +22,8 @@
 #include <tools/solar.h>
 #include <sal/types.h>
 #include <editeng/langitem.hxx>
-#include <hintids.hxx>
-#include <swtypes.hxx>
+#include "hintids.hxx"
+#include "swtypes.hxx"
 #include <deque>
 
 class SwTextNode;
diff --git a/sw/inc/txtannotationfld.hxx b/sw/inc/txtannotationfld.hxx
index 0dd5c9d644de..101011c0377f 100644
--- a/sw/inc/txtannotationfld.hxx
+++ b/sw/inc/txtannotationfld.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_SW_INC_TXTANNOTATIONFLD_HXX
 #define INCLUDED_SW_INC_TXTANNOTATIONFLD_HXX
 
-#include <txtfld.hxx>
-#include <IMark.hxx>
+#include "txtfld.hxx"
+#include "IMark.hxx"
 
 class SwDoc;
 
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index 3dea8e696ba6..d25b26075504 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_SW_INC_TXTATR_HXX
 #define INCLUDED_SW_INC_TXTATR_HXX
 
-#include <txatbase.hxx>
-#include <calbck.hxx>
+#include "txatbase.hxx"
+#include "calbck.hxx"
 
 class SwTextNode;
 class SwCharFormat;
diff --git a/sw/inc/txtflcnt.hxx b/sw/inc/txtflcnt.hxx
index ed44abe4533a..c9baa25ff21c 100644
--- a/sw/inc/txtflcnt.hxx
+++ b/sw/inc/txtflcnt.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_TXTFLCNT_HXX
 #define INCLUDED_SW_INC_TXTFLCNT_HXX
 
-#include <txatbase.hxx>
+#include "txatbase.hxx"
 
 class SwFlyInContentFrame;
 class SwFrame;
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index edd23e06c736..87a01c906961 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_TXTFLD_HXX
 #define INCLUDED_SW_INC_TXTFLD_HXX
 
-#include <txatbase.hxx>
+#include "txatbase.hxx"
 #include <rtl/ustring.hxx>
 #include <osl/diagnose.h>
 
diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx
index 8d805f54fcc0..1a7a678b0377 100644
--- a/sw/inc/txtftn.hxx
+++ b/sw/inc/txtftn.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_TXTFTN_HXX
 #define INCLUDED_SW_INC_TXTFTN_HXX
 
-#include <txatbase.hxx>
+#include "txatbase.hxx"
 
 namespace rtl { class OUString; }
 
diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx
index ad93d97761e0..6bbc14d528e8 100644
--- a/sw/inc/txtinet.hxx
+++ b/sw/inc/txtinet.hxx
@@ -19,9 +19,9 @@
 #ifndef INCLUDED_SW_INC_TXTINET_HXX
 #define INCLUDED_SW_INC_TXTINET_HXX
 
-#include <txatbase.hxx>
-#include <txtatr.hxx>
-#include <calbck.hxx>
+#include "txatbase.hxx"
+#include "txtatr.hxx"
+#include "calbck.hxx"
 
 class SwTextNode;
 class SwCharFormat;
diff --git a/sw/inc/txtrfmrk.hxx b/sw/inc/txtrfmrk.hxx
index 23d21a20e4ba..f756a587ce18 100644
--- a/sw/inc/txtrfmrk.hxx
+++ b/sw/inc/txtrfmrk.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_TXTRFMRK_HXX
 #define INCLUDED_SW_INC_TXTRFMRK_HXX
 
-#include <txatbase.hxx>
+#include "txatbase.hxx"
 
 class SwTextNode;
 
diff --git a/sw/inc/txttxmrk.hxx b/sw/inc/txttxmrk.hxx
index 931dd10c72a4..2329c1c5012e 100644
--- a/sw/inc/txttxmrk.hxx
+++ b/sw/inc/txttxmrk.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_TXTTXMRK_HXX
 #define INCLUDED_SW_INC_TXTTXMRK_HXX
 
-#include <txatbase.hxx>
+#include "txatbase.hxx"
 
 class SwTextNode;
 class SwDoc;
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 60069b8fa18e..1c210cf45e75 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -24,8 +24,8 @@
 
 #include <svl/undo.hxx>
 #include <tools/solar.h>
-#include <SwRewriter.hxx>
-#include <swundo.hxx>
+#include "SwRewriter.hxx"
+#include "swundo.hxx"
 #include <o3tl/typed_flags_set.hxx>
 
 class SwHistory;
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 4769254de14e..ef7647b171f2 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -50,9 +50,9 @@
 #include <tools/link.hxx>
 #include <vcl/timer.hxx>
 
-#include <calbck.hxx>
-#include <frmfmt.hxx>
-#include <unocrsr.hxx>
+#include "calbck.hxx"
+#include "frmfmt.hxx"
+#include "unocrsr.hxx"
 
 class SfxItemPropertySet;
 class SwDoc;
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index f25d90b80bbb..20d5dd1e9efa 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -19,15 +19,15 @@
 #ifndef INCLUDED_SW_INC_UNOCOLL_HXX
 #define INCLUDED_SW_INC_UNOCOLL_HXX
 #include <tools/solar.h>
-#include <flyenum.hxx>
+#include "flyenum.hxx"
 #include <vcl/timer.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <IMark.hxx>
-#include <unobaseclass.hxx>
+#include "IMark.hxx"
+#include "unobaseclass.hxx"
 #include "swdllapi.h"
 
 class SwDoc;
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx
index d789bed5db39..fc03253a1109 100644
--- a/sw/inc/unocrsr.hxx
+++ b/sw/inc/unocrsr.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_UNOCRSR_HXX
 #define INCLUDED_SW_INC_UNOCRSR_HXX
 
-#include <swcrsr.hxx>
+#include "swcrsr.hxx"
 #include <svl/SfxBroadcaster.hxx>
 #include <svl/lstner.hxx>
 
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index 50ab906d2385..b563b302b84b 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -23,9 +23,9 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uno/DeploymentException.hpp>
 
-#include <swtypes.hxx>
-#include <flyenum.hxx>
-#include <pam.hxx>
+#include "swtypes.hxx"
+#include "flyenum.hxx"
+#include "pam.hxx"
 
 #include <map>
 
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 4132b3157ad1..5eb68ddac0e1 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -20,8 +20,8 @@
 #define INCLUDED_SW_INC_UNODRAW_HXX
 
 #include <svx/fmdpage.hxx>
-#include <calbck.hxx>
-#include <frmfmt.hxx>
+#include "calbck.hxx"
+#include "frmfmt.hxx"
 #include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
diff --git a/sw/inc/unofieldcoll.hxx b/sw/inc/unofieldcoll.hxx
index 5d30d19bef11..ec068675ad2a 100644
--- a/sw/inc/unofieldcoll.hxx
+++ b/sw/inc/unofieldcoll.hxx
@@ -24,7 +24,7 @@
 
 #include <com/sun/star/util/XRefreshable.hpp>
 
-#include <unocoll.hxx>
+#include "unocoll.hxx"
 
 class SwFieldType;
 
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 1c642296eceb..0fcff03dae77 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -33,9 +33,9 @@
 
 #include <sfx2/objsh.hxx>
 
-#include <flyenum.hxx>
-#include <frmfmt.hxx>
-#include <unotext.hxx>
+#include "flyenum.hxx"
+#include "frmfmt.hxx"
+#include "unotext.hxx"
 
 class SdrObject;
 class SwDoc;
diff --git a/sw/inc/unoidxcoll.hxx b/sw/inc/unoidxcoll.hxx
index f2714217cf0c..29310fe4ecb1 100644
--- a/sw/inc/unoidxcoll.hxx
+++ b/sw/inc/unoidxcoll.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_UNOIDXCOLL_HXX
 #define INCLUDED_SW_INC_UNOIDXCOLL_HXX
 
-#include <unocoll.hxx>
+#include "unocoll.hxx"
 
 class SwXDocumentIndexes
     : public SwCollectionBaseClass
diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx
index 4c598c5c63a9..e915b4d51a5c 100644
--- a/sw/inc/unoparagraph.hxx
+++ b/sw/inc/unoparagraph.hxx
@@ -37,7 +37,7 @@
 
 #include <sfx2/Metadatable.hxx>
 
-#include <unobaseclass.hxx>
+#include "unobaseclass.hxx"
 
 struct SwPosition;
 class SwPaM;
diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx
index bcf65d6ecefd..e28064e8a102 100644
--- a/sw/inc/unoredline.hxx
+++ b/sw/inc/unoredline.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_UNOREDLINE_HXX
 #define INCLUDED_SW_INC_UNOREDLINE_HXX
 
-#include <unotext.hxx>
+#include "unotext.hxx"
 
 class SwRangeRedline;
 
diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx
index 9fe86311ca38..380745c41672 100644
--- a/sw/inc/unoredlines.hxx
+++ b/sw/inc/unoredlines.hxx
@@ -21,9 +21,9 @@
 
 #include <sal/config.h>
 
-#include <docary.hxx>
-#include <unocoll.hxx>
-#include <unobaseclass.hxx>
+#include "docary.hxx"
+#include "unocoll.hxx"
+#include "unobaseclass.hxx"
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 
 class SwRangeRedline;
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index 96668f3680c0..295eb06fe671 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_SW_INC_UNOSETT_HXX
 #define INCLUDED_SW_INC_UNOSETT_HXX
 
-#include <swtypes.hxx>
-#include <calbck.hxx>
+#include "swtypes.hxx"
+#include "calbck.hxx"
 #include <com/sun/star/text/XTextColumns.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -33,7 +33,7 @@
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include <svl/itemprop.hxx>
-#include <unobaseclass.hxx>
+#include "unobaseclass.hxx"
 
 class SwDoc;
 class SwFormatCol;
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 3f45f52e175f..2d164505574b 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -21,8 +21,8 @@
 
 #include <svl/style.hxx>
 #include <svl/lstner.hxx>
-#include <unocoll.hxx>
-#include <unomap.hxx>
+#include "unocoll.hxx"
+#include "unomap.hxx"
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/style/XStyleLoader.hpp>
@@ -33,13 +33,13 @@
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/document/XEventsSupplier.hpp>
-#include <calbck.hxx>
+#include "calbck.hxx"
 
 #include <com/sun/star/style/XAutoStyleFamily.hpp>
 #include <com/sun/star/style/XAutoStyles.hpp>
 #include <com/sun/star/style/XAutoStyle.hpp>
 
-#include <istyleaccess.hxx>
+#include "istyleaccess.hxx"
 #include <memory>
 
 class SwDocShell;
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 4bb30e0de931..d34e132fcd89 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -36,11 +36,11 @@
 
 #include <comphelper/uno3.hxx>
 
-#include <calbck.hxx>
-#include <TextCursorHelper.hxx>
-#include <unotext.hxx>
-#include <frmfmt.hxx>
-#include <unocrsr.hxx>
+#include "calbck.hxx"
+#include "TextCursorHelper.hxx"
+#include "unotext.hxx"
+#include "frmfmt.hxx"
+#include "unocrsr.hxx"
 
 class SwTable;
 class SwTableBox;
diff --git a/sw/inc/unotext.hxx b/sw/inc/unotext.hxx
index 65a1ecc94d36..56accd788645 100644
--- a/sw/inc/unotext.hxx
+++ b/sw/inc/unotext.hxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/text/XRelativeTextContentRemove.hpp>
 #include <com/sun/star/text/XTextAppendAndConvert.hpp>
 
-#include <unobaseclass.hxx>
+#include "unobaseclass.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace text {
diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx
index 49851d55b88e..5a7f09279d87 100644
--- a/sw/inc/unotextbodyhf.hxx
+++ b/sw/inc/unotextbodyhf.hxx
@@ -27,7 +27,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase2.hxx>
 
-#include <unotext.hxx>
+#include "unotext.hxx"
 
 class SwDoc;
 class SwFrameFormat;
diff --git a/sw/inc/unotextcursor.hxx b/sw/inc/unotextcursor.hxx
index 1bb2f9a119d8..ff9e759cef9e 100644
--- a/sw/inc/unotextcursor.hxx
+++ b/sw/inc/unotextcursor.hxx
@@ -40,8 +40,8 @@
 
 #include <comphelper/uno3.hxx>
 
-#include <unobaseclass.hxx>
-#include <TextCursorHelper.hxx>
+#include "unobaseclass.hxx"
+#include "TextCursorHelper.hxx"
 
 class SwDoc;
 struct SwPosition;
diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx
index 59d41f80360c..9506a7790852 100644
--- a/sw/inc/unotextrange.hxx
+++ b/sw/inc/unotextrange.hxx
@@ -32,8 +32,8 @@
 
 #include <cppuhelper/implbase.hxx>
 
-#include <pam.hxx>
-#include <unobaseclass.hxx>
+#include "pam.hxx"
+#include "unobaseclass.hxx"
 
 class SwDoc;
 class SwUnoCursor;
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 868dbabbcb72..e6d0770374d3 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -73,8 +73,8 @@
 #include <vcl/IDialogRenderable.hxx>
 #include <com/sun/star/tiledrendering/XTiledRenderable.hpp>
 
-#include <unobaseclass.hxx>
-#include <viewopt.hxx>
+#include "unobaseclass.hxx"
+#include "viewopt.hxx"
 
 #include <deque>
 
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 9ff608b135ac..a1dc5bcf9359 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -33,9 +33,9 @@
 #include <svx/fmshell.hxx>
 #include <editeng/editstat.hxx>
 #include "swdllapi.h"
-#include <swtypes.hxx>
-#include <shellid.hxx>
-#include <IMark.hxx>
+#include "swtypes.hxx"
+#include "shellid.hxx"
+#include "IMark.hxx"
 
 class Button;
 class ImageButton;
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 6688ff6cb0e9..566653342451 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -22,9 +22,9 @@
 #include <com/sun/star/embed/XClassifiedObject.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include "swdllapi.h"
-#include <swtypes.hxx>
-#include <ring.hxx>
-#include <swrect.hxx>
+#include "swtypes.hxx"
+#include "ring.hxx"
+#include "swrect.hxx"
 #include <memory>
 #include <stack>
 #include <vcl/mapmod.hxx>
diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index 5d072240b6fa..dce7e18a1a27 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -21,13 +21,13 @@
 #include <svl/stritem.hxx>
 #include <unotools/tempfile.hxx>
 
-#include "init.hxx"
-#include "iodetect.hxx"
-#include "swtypes.hxx"
-#include "doc.hxx"
-#include "docsh.hxx"
-#include "shellres.hxx"
-#include "docufld.hxx"
+#include <init.hxx>
+#include <iodetect.hxx>
+#include <swtypes.hxx>
+#include <doc.hxx>
+#include <docsh.hxx>
+#include <shellres.hxx>
+#include <docufld.hxx>
 
 typedef tools::SvRef<SwDocShell> SwDocShellRef;
 
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 4c712f8da7a0..d9ed64eb4dd9 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -55,7 +55,7 @@
 #include <IDocumentLayoutAccess.hxx>
 #include <IDocumentUndoRedo.hxx>
 #include <IDocumentContentOperations.hxx>
-#include "docsh.hxx"
+#include <docsh.hxx>
 #include <unotxdoc.hxx>
 
 typedef tools::SvRef<SwDocShell> SwDocShellRef;
diff --git a/sw/qa/core/test_ToxLinkProcessor.cxx b/sw/qa/core/test_ToxLinkProcessor.cxx
index c59a0fa6c11e..00c10aa16271 100644
--- a/sw/qa/core/test_ToxLinkProcessor.cxx
+++ b/sw/qa/core/test_ToxLinkProcessor.cxx
@@ -22,8 +22,8 @@
 
 #include <strings.hrc>
 #include <swdll.hxx>
-#include "swtypes.hxx"
-#include "SwStyleNameMapper.hxx"
+#include <swtypes.hxx>
+#include <SwStyleNameMapper.hxx>
 
 using namespace sw;
 
diff --git a/sw/qa/core/test_ToxMiscTest.cxx b/sw/qa/core/test_ToxMiscTest.cxx
index 0b668f4e9c0e..67a6320cf81b 100644
--- a/sw/qa/core/test_ToxMiscTest.cxx
+++ b/sw/qa/core/test_ToxMiscTest.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "tox.hxx"
+#include <tox.hxx>
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
diff --git a/sw/qa/core/test_ToxTextGenerator.cxx b/sw/qa/core/test_ToxTextGenerator.cxx
index 0803d21be61d..5bd25a844665 100644
--- a/sw/qa/core/test_ToxTextGenerator.cxx
+++ b/sw/qa/core/test_ToxTextGenerator.cxx
@@ -7,13 +7,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "rtl/ustring.hxx"
-#include "chpfld.hxx"
-#include "ndtxt.hxx"
-#include "tox.hxx"
-#include "txmsrt.hxx"
-#include "ToxTextGenerator.hxx"
-#include "ToxTabStopTokenHandler.hxx"
+#include <rtl/ustring.hxx>
+#include <chpfld.hxx>
+#include <ndtxt.hxx>
+#include <tox.hxx>
+#include <txmsrt.hxx>
+#include <ToxTextGenerator.hxx>
+#include <ToxTabStopTokenHandler.hxx>
 
 #include <memory>
 
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index aad835ef4202..9b68dc156d08 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -30,39 +30,39 @@
 
 #include <xmloff/odffields.hxx>
 
-#include "breakit.hxx"
-#include "doc.hxx"
+#include <breakit.hxx>
+#include <doc.hxx>
 #include <IDocumentRedlineAccess.hxx>
 #include <IDocumentFieldsAccess.hxx>
 #include <IDocumentStatistics.hxx>
-#include "cellfml.hxx"
-#include "docsh.hxx"
-#include "docstat.hxx"
-#include "docufld.hxx"
-#include "fmtanchr.hxx"
-#include "init.hxx"
-#include "ndtxt.hxx"
-#include "shellio.hxx"
-#include "shellres.hxx"
-#include "swcrsr.hxx"
-#include "swscanner.hxx"
-#include "swmodule.hxx"
+#include <cellfml.hxx>
+#include <docsh.hxx>
+#include <docstat.hxx>
+#include <docufld.hxx>
+#include <fmtanchr.hxx>
+#include <init.hxx>
+#include <ndtxt.hxx>
+#include <shellio.hxx>
+#include <shellres.hxx>
+#include <swcrsr.hxx>
+#include <swscanner.hxx>
+#include <swmodule.hxx>
 #include <swdll.hxx>
-#include "swtypes.hxx"
-#include "fmtftn.hxx"
-#include "fmtrfmrk.hxx"
+#include <swtypes.hxx>
+#include <fmtftn.hxx>
+#include <fmtrfmrk.hxx>
 #include <fmtinfmt.hxx>
 #include <fchrfmt.hxx>
-#include "fmtfld.hxx"
-#include "redline.hxx"
-#include "docary.hxx"
-#include "modeltoviewhelper.hxx"
-#include "scriptinfo.hxx"
-#include "IMark.hxx"
-#include "ring.hxx"
-#include "calbck.hxx"
-#include "pagedesc.hxx"
-#include "calc.hxx"
+#include <fmtfld.hxx>
+#include <redline.hxx>
+#include <docary.hxx>
+#include <modeltoviewhelper.hxx>
+#include <scriptinfo.hxx>
+#include <IMark.hxx>
+#include <ring.hxx>
+#include <calbck.hxx>
+#include <pagedesc.hxx>
+#include <calc.hxx>
 
 #include <tblafmt.hxx>
 #include <unotbl.hxx>
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index 99f5a17d4867..42991a3c3b8b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -8,7 +8,7 @@
  */
 
 #include <memory>
-#include "config_test.h"
+#include <config_test.h>
 
 #ifdef MACOSX
 #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 0f0a9aa0540a..29e008b4d147 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -8,7 +8,7 @@
  */
 
 #include <memory>
-#include "config_test.h"
+#include <config_test.h>
 
 #ifdef MACOSX
 #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
diff --git a/sw/qa/extras/rtfexport/rtfexport2.cxx b/sw/qa/extras/rtfexport/rtfexport2.cxx
index c81a2cff3615..d9a4e9995bd2 100644
--- a/sw/qa/extras/rtfexport/rtfexport2.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport2.cxx
@@ -48,7 +48,7 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/streamwrap.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include "comphelper/configuration.hxx"
+#include <comphelper/configuration.hxx>
 
 #include <bordertest.hxx>
 
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 4003ba3b4184..50c39d5eb1ce 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -48,7 +48,7 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/streamwrap.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include "comphelper/configuration.hxx"
+#include <comphelper/configuration.hxx>
 
 class Test : public SwModelTestBase
 {
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 679f48ce69b5..fc372f646561 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -46,12 +46,12 @@
 #include <postithelper.hxx>
 #include <PostItMgr.hxx>
 #include <AnnotationWin.hxx>
-#include "com/sun/star/text/XDefaultNumberingProvider.hpp"
-#include "com/sun/star/awt/FontUnderline.hpp"
+#include <com/sun/star/text/XDefaultNumberingProvider.hpp>
+#include <com/sun/star/awt/FontUnderline.hpp>
 
 #include <svx/svdpage.hxx>
 #include <svx/svdview.hxx>
-#include "svl/itemiter.hxx"
+#include <svl/itemiter.hxx>
 
 #include <editeng/eeitem.hxx>
 #include <editeng/scripttypeitem.hxx>
@@ -66,26 +66,26 @@
 #include <IDocumentFieldsAccess.hxx>
 #include <IDocumentState.hxx>
 #include <unofldmid.h>
-#include "UndoManager.hxx"
+#include <UndoManager.hxx>
 #include <textsh.hxx>
 #include <frmmgr.hxx>
 #include <tblafmt.hxx>
 
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include "com/sun/star/util/XNumberFormatTypes.hpp"
-#include "com/sun/star/util/NumberFormat.hpp"
-#include "com/sun/star/util/XNumberFormatsSupplier.hpp"
+#include <com/sun/star/util/XNumberFormatTypes.hpp>
+#include <com/sun/star/util/NumberFormat.hpp>
+#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/util/SearchAlgorithms2.hpp>
 #include <com/sun/star/util/SearchFlags.hpp>
-#include "com/sun/star/util/SearchAlgorithms.hpp"
-#include "com/sun/star/sdbcx/XTablesSupplier.hpp"
-#include "com/sun/star/text/XParagraphCursor.hpp"
-#include "com/sun/star/util/XPropertyReplace.hpp"
-#include "com/sun/star/awt/FontStrikeout.hpp"
-#include "com/sun/star/beans/PropertyAttribute.hpp"
-#include "com/sun/star/text/XTextField.hpp"
-#include "com/sun/star/text/TextMarkupType.hpp"
+#include <com/sun/star/util/SearchAlgorithms.hpp>
+#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
+#include <com/sun/star/text/XParagraphCursor.hpp>
+#include <com/sun/star/util/XPropertyReplace.hpp>
+#include <com/sun/star/awt/FontStrikeout.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/text/XTextField.hpp>
+#include <com/sun/star/text/TextMarkupType.hpp>
 #include <com/sun/star/chart2/data/XDataSource.hpp>
 #include <com/sun/star/document/XEmbeddedObjectSupplier2.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index 78ac8fe2a8c8..7e344f78ef14 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -28,13 +28,13 @@
 #include <cellfrm.hxx>
 #include <tabfrm.hxx>
 #include <swtable.hxx>
-#include "crsrsh.hxx"
-#include "viscrs.hxx"
+#include <crsrsh.hxx>
+#include <viscrs.hxx>
 #include "accfrmobj.hxx"
 #include "accfrmobjslist.hxx"
-#include "frmfmt.hxx"
-#include "cellatr.hxx"
-#include "accmap.hxx"
+#include <frmfmt.hxx>
+#include <cellatr.hxx>
+#include <accmap.hxx>
 #include "acccell.hxx"
 
 #include <cfloat>
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 9e4b1b600feb..7cf9b874e8d7 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -32,16 +32,16 @@
 #include <doc.hxx>
 #include <accmap.hxx>
 #include "accdoc.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 #include <pagefrm.hxx>
 
 #include <editeng/brushitem.hxx>
 #include <swatrset.hxx>
 #include <frmatr.hxx>
-#include "unostyle.hxx"
-#include "docsh.hxx"
+#include <unostyle.hxx>
+#include <docsh.hxx>
 #include <crsrsh.hxx>
-#include "fesh.hxx"
+#include <fesh.hxx>
 #include <fmtclds.hxx>
 #include <flyfrm.hxx>
 #include <colfrm.hxx>
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index 6d4fc0e4bd6c..4aae73f4993a 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -24,8 +24,8 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <flyfrm.hxx>
 #include "accembedded.hxx"
-#include "cntfrm.hxx"
-#include "ndole.hxx"
+#include <cntfrm.hxx>
+#include <ndole.hxx>
 #include <doc.hxx>
 #include <docsh.hxx>
 
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index c01f6b0e902f..c21596a011b8 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -28,7 +28,7 @@
 #include <viewsh.hxx>
 #include <accmap.hxx>
 #include "accfootnote.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index ea619e72b333..7ca7d96aa934 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -29,9 +29,9 @@
 #include <cntfrm.hxx>
 #include <fmtcntnt.hxx>
 #include <ndindex.hxx>
-#include "fesh.hxx"
+#include <fesh.hxx>
 #include <hints.hxx>
-#include "accmap.hxx"
+#include <accmap.hxx>
 #include "accframebase.hxx"
 
 #include <crsrsh.hxx>
diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx
index 24050ecfe622..0af5793b3247 100644
--- a/sw/source/core/access/accheaderfooter.cxx
+++ b/sw/source/core/access/accheaderfooter.cxx
@@ -24,7 +24,7 @@
 #include <vcl/svapp.hxx>
 #include <hffrm.hxx>
 #include "accheaderfooter.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index c1ec931b9a51..cfec5a6be975 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -26,7 +26,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include "accpage.hxx"
 
-#include "strings.hrc"
+#include <strings.hrc>
 #include <pagefrm.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 113ae1c23d7d..cce1b6a8eba4 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -66,8 +66,8 @@
 #include <fmtfld.hxx>
 #include <modcfg.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include "swmodule.hxx"
-#include "redline.hxx"
+#include <swmodule.hxx>
+#include <redline.hxx>
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/awt/FontStrikeout.hpp>
 #include <com/sun/star/awt/FontSlant.hpp>
@@ -92,7 +92,7 @@
 #include <expfld.hxx>
 #include <flddat.hxx>
 #include "../../uibase/inc/fldmgr.hxx"
-#include "fldbas.hxx"      // SwField
+#include <fldbas.hxx>      // SwField
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index 699114cf30c9..c61deb8dd665 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -23,31 +23,31 @@
 #include <txttypes.hxx>
 
 // for portion replacement in Special()
-#include "strings.hrc"
-#include "viewopt.hxx"
+#include <strings.hrc>
+#include <viewopt.hxx>
 
 // for GetWordBoundary(...), GetSentenceBoundary(...):
 #include <breakit.hxx>
 #include <ndtxt.hxx>
 
 // for FillSpecialPos(...)
-#include "crstate.hxx"
+#include <crstate.hxx>
 
 // for SwAccessibleContext::GetResource()
 #include "acccontext.hxx"
 
 // for Post-It replacement text:
-#include "txatbase.hxx"
-#include "fmtfld.hxx"
-#include "fldbas.hxx"
-#include "docufld.hxx"
+#include <txatbase.hxx>
+#include <fmtfld.hxx>
+#include <fldbas.hxx>
+#include <docufld.hxx>
 
 // for in-line graphics replacement:
-#include "ndindex.hxx"
-#include "ndnotxt.hxx"
-#include "fmtflcnt.hxx"
-#include "frmfmt.hxx"
-#include "fmtcntnt.hxx"
+#include <ndindex.hxx>
+#include <ndnotxt.hxx>
+#include <fmtflcnt.hxx>
+#include <frmfmt.hxx>
+#include <fmtcntnt.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx
index 244e7ca0aed7..77919e3199ad 100644
--- a/sw/source/core/access/accpreview.cxx
+++ b/sw/source/core/access/accpreview.cxx
@@ -21,7 +21,7 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 #include "accpreview.hxx"
 
 const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleDocumentPageView";
diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx b/sw/source/core/bastyp/SwSmartTagMgr.cxx
index 19e1a1662b04..80b9a92a0bc4 100644
--- a/sw/source/core/bastyp/SwSmartTagMgr.cxx
+++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "SwSmartTagMgr.hxx"
+#include <SwSmartTagMgr.hxx>
 
 #include <docsh.hxx>
 #include <swmodule.hxx>
diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx
index 7bbfdb03c35d..eba3848b898a 100644
--- a/sw/source/core/bastyp/bparr.cxx
+++ b/sw/source/core/bastyp/bparr.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "bparr.hxx"
+#include <bparr.hxx>
 
 #include <limits.h>
 #include <string.h>
diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx
index dfe61305670f..5287dd3286fd 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "breakit.hxx"
-#include "swtypes.hxx"
+#include <breakit.hxx>
+#include <swtypes.hxx>
 
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index 218fd6a95fce..4f740948abff 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "index.hxx"
+#include <index.hxx>
 
 #include <assert.h>
 #include <sal/log.hxx>
diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx
index 93937b9f2861..40ab1badff70 100644
--- a/sw/source/core/bastyp/swrect.cxx
+++ b/sw/source/core/bastyp/swrect.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "swrect.hxx"
+#include <swrect.hxx>
 
 #ifdef DBG_UTIL
 #include <tools/stream.hxx>
diff --git a/sw/source/core/bastyp/swregion.cxx b/sw/source/core/bastyp/swregion.cxx
index bd17f8e2dd5f..42d1ac40d15f 100644
--- a/sw/source/core/bastyp/swregion.cxx
+++ b/sw/source/core/bastyp/swregion.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "swrect.hxx"
-#include "swregion.hxx"
-#include "swtypes.hxx"
+#include <swrect.hxx>
+#include <swregion.hxx>
+#include <swtypes.hxx>
 
 SwRegionRects::SwRegionRects( const SwRect &rStartRect, sal_uInt16 nInit ) :
     SwRects(),
diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx
index 0e0556ba3b61..eb6279c1c695 100644
--- a/sw/source/core/bastyp/swtypes.cxx
+++ b/sw/source/core/bastyp/swtypes.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "swtypes.hxx"
+#include <swtypes.hxx>
 #include <rtl/ustring.hxx>
 
 #include <bodyfrm.hxx>
diff --git a/sw/source/core/bastyp/tabcol.cxx b/sw/source/core/bastyp/tabcol.cxx
index 6bc07fe80c3c..c17a0a87dc22 100644
--- a/sw/source/core/bastyp/tabcol.cxx
+++ b/sw/source/core/bastyp/tabcol.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "tabcol.hxx"
+#include <tabcol.hxx>
 #include <limits.h>
 
 SwTabCols::SwTabCols( sal_uInt16 nSize ) :
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index ceca8453e8d2..18c4c857f7d4 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "crsrsh.hxx"
-#include "ndtxt.hxx"
+#include <crsrsh.hxx>
+#include <ndtxt.hxx>
 #include <docary.hxx>
-#include "IMark.hxx"
+#include <IMark.hxx>
 #include "callnk.hxx"
-#include "swcrsr.hxx"
+#include <swcrsr.hxx>
 #include <IDocumentMarkAccess.hxx>
 #include <IDocumentSettingAccess.hxx>
 
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index b1bb87e7f8e1..606b778387ea 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -64,7 +64,7 @@
 #include <fesh.hxx>
 #include <charfmt.hxx>
 #include <fmturl.hxx>
-#include "txtfrm.hxx"
+#include <txtfrm.hxx>
 #include <wrong.hxx>
 #include <calbck.hxx>
 #include <unotools/intlwrapper.hxx>
diff --git a/sw/source/core/doc/SwDocIdle.cxx b/sw/source/core/doc/SwDocIdle.cxx
index 5987274a6b3d..f81c7a5de53d 100644
--- a/sw/source/core/doc/SwDocIdle.cxx
+++ b/sw/source/core/doc/SwDocIdle.cxx
@@ -23,8 +23,8 @@
 #include <viewopt.hxx>
 #include <vcl/scheduler.hxx>
 
-#include "SwDocIdle.hxx"
-#include "IDocumentTimerAccess.hxx"
+#include <SwDocIdle.hxx>
+#include <IDocumentTimerAccess.hxx>
 
 namespace sw
 {
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 3532929cd5bf..3b88309bd873 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -37,8 +37,8 @@
 #include <txtfrm.hxx>
 #include <breakit.hxx>
 #include <vcl/layout.hxx>
-#include "strings.hrc"
-#include "editsh.hxx"
+#include <strings.hrc>
+#include <editsh.hxx>
 #include <fmtfld.hxx>
 #include <docufld.hxx>
 #include <unoflatpara.hxx>
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 85005cdf3b86..71072603c730 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -58,7 +58,7 @@
 #include <unoport.hxx>
 #include <wrtsh.hxx>
 
-#include "flowfrm.hxx"
+#include <flowfrm.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index a86030a01301..9ffef39248a3 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <memory>
-#include "hintids.hxx"
+#include <hintids.hxx>
 
 #include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
@@ -27,23 +27,23 @@
 #include <fmtfsize.hxx>
 #include <frmfmt.hxx>
 #include <docary.hxx>
-#include "ndtxt.hxx"
-#include "doc.hxx"
+#include <ndtxt.hxx>
+#include <doc.hxx>
 #include <IDocumentLayoutAccess.hxx>
-#include "swtable.hxx"
-#include "rootfrm.hxx"
-#include "docsh.hxx"
-#include "flyfrm.hxx"
-#include "poolfmt.hxx"
-#include "viewsh.hxx"
-#include "tabfrm.hxx"
-#include "viewopt.hxx"
-#include "htmltbl.hxx"
-#include "ndindex.hxx"
+#include <swtable.hxx>
+#include <rootfrm.hxx>
+#include <docsh.hxx>
+#include <flyfrm.hxx>
+#include <poolfmt.hxx>
+#include <viewsh.hxx>
+#include <tabfrm.hxx>
+#include <viewopt.hxx>
+#include <htmltbl.hxx>
+#include <ndindex.hxx>
 #include <calbck.hxx>
 #include <o3tl/numeric.hxx>
 #ifdef DBG_UTIL
-#include "tblrwcl.hxx"
+#include <tblrwcl.hxx>
 #endif
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/doc/lineinfo.cxx b/sw/source/core/doc/lineinfo.cxx
index e63b385e1a37..d8cf7439a38e 100644
--- a/sw/source/core/doc/lineinfo.cxx
+++ b/sw/source/core/doc/lineinfo.cxx
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "doc.hxx"
+#include <doc.hxx>
 #include <IDocumentLayoutAccess.hxx>
 #include <IDocumentStylePoolAccess.hxx>
 #include <IDocumentState.hxx>
-#include "lineinfo.hxx"
-#include "charfmt.hxx"
-#include "poolfmt.hxx"
-#include "rootfrm.hxx"
-#include "viewsh.hxx"
+#include <lineinfo.hxx>
+#include <charfmt.hxx>
+#include <poolfmt.hxx>
+#include <rootfrm.hxx>
+#include <viewsh.hxx>
 #include <set>
 
 void SwDoc::SetLineNumberInfo( const SwLineNumberInfo &rNew )
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 5590071bd174..b0c5102a5df8 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -82,7 +82,7 @@
 #include <frmtool.hxx>
 #include <node2lay.hxx>
 #include <strings.hrc>
-#include "docsh.hxx"
+#include <docsh.hxx>
 #include <unochart.hxx>
 #include <node.hxx>
 #include <ndtxt.hxx>
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx
index 964f5f7d2f93..eff7995de2a5 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/brushitem.hxx>
@@ -38,16 +38,16 @@
 #include <IDocumentUndoRedo.hxx>
 #include <IDocumentState.hxx>
 #include <IDocumentLayoutAccess.hxx>
-#include "pam.hxx"
-#include "swcrsr.hxx"
-#include "viscrs.hxx"
-#include "swtable.hxx"
-#include "htmltbl.hxx"
-#include "tblsel.hxx"
-#include "swtblfmt.hxx"
-#include "docary.hxx"
-#include "ndindex.hxx"
-#include "undobj.hxx"
+#include <pam.hxx>
+#include <swcrsr.hxx>
+#include <viscrs.hxx>
+#include <swtable.hxx>
+#include <htmltbl.hxx>
+#include <tblsel.hxx>
+#include <swtblfmt.hxx>
+#include <docary.hxx>
+#include <ndindex.hxx>
+#include <undobj.hxx>
 #include <calbck.hxx>
 #include <UndoTable.hxx>
 #include <o3tl/enumrange.hxx>
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index b4ee2e677631..0178d986c8ad 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -64,7 +64,7 @@
 #include <IDocumentRedlineAccess.hxx>
 #include <IDocumentLayoutAccess.hxx>
 #include <calbck.hxx>
-#include "ndole.hxx"
+#include <ndole.hxx>
 #include <memory>
 #include <swcrsr.hxx>
 #include <svl/itemiter.hxx>
diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx
index ee852d8f3cf0..0f1a45e5eee1 100644
--- a/sw/source/core/docnode/node2lay.cxx
+++ b/sw/source/core/docnode/node2lay.cxx
@@ -23,12 +23,12 @@
 #include <swtable.hxx>
 #include <ftnfrm.hxx>
 #include <sectfrm.hxx>
-#include "frmfmt.hxx"
-#include "cntfrm.hxx"
-#include "tabfrm.hxx"
-#include "frmtool.hxx"
-#include "section.hxx"
-#include "node2lay.hxx"
+#include <frmfmt.hxx>
+#include <cntfrm.hxx>
+#include <tabfrm.hxx>
+#include <frmtool.hxx>
+#include <section.hxx>
+#include <node2lay.hxx>
 
 /**
  * The SwNode2LayImpl class does the actual work, the SwNode2Layout class is
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index f71286a7a521..b0ef8d2a0600 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <memory>
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <editeng/protitem.hxx>
 #include <editeng/opaqitem.hxx>
 #include <editeng/ulspitem.hxx>
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 1d824b2264e8..1acaa2bb4605 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <comphelper/lok.hxx>
 #include <tools/mapunit.hxx>
 #include <svx/svdtrans.hxx>
@@ -30,24 +30,24 @@
 #include <fmtornt.hxx>
 #include <fmtfsize.hxx>
 #include <fmturl.hxx>
-#include "viewsh.hxx"
-#include "viewimp.hxx"
-#include "cntfrm.hxx"
-#include "frmatr.hxx"
-#include "doc.hxx"
+#include <viewsh.hxx>
+#include <viewimp.hxx>
+#include <cntfrm.hxx>
+#include <frmatr.hxx>
+#include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
-#include "dview.hxx"
-#include "dflyobj.hxx"
-#include "flyfrm.hxx"
-#include "frmfmt.hxx"
-#include "viewopt.hxx"
-#include "frmtool.hxx"
-#include "flyfrms.hxx"
-#include "ndnotxt.hxx"
-#include "grfatr.hxx"
-#include "pagefrm.hxx"
-#include "rootfrm.hxx"
-#include "wrtsh.hxx"
+#include <dview.hxx>
+#include <dflyobj.hxx>
+#include <flyfrm.hxx>
+#include <frmfmt.hxx>
+#include <viewopt.hxx>
+#include <frmtool.hxx>
+#include <flyfrms.hxx>
+#include <ndnotxt.hxx>
+#include <grfatr.hxx>
+#include <pagefrm.hxx>
+#include <rootfrm.hxx>
+#include <wrtsh.hxx>
 #include <ndgrf.hxx>
 #include <frmmgr.hxx>
 
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 0935ddbd637c..9245c41556c4 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <editeng/protitem.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/fmmodel.hxx>
@@ -27,26 +27,26 @@
 #include <editeng/outliner.hxx>
 #include <com/sun/star/embed/EmbedMisc.hpp>
 
-#include "swtypes.hxx"
-#include "pagefrm.hxx"
-#include "rootfrm.hxx"
-#include "cntfrm.hxx"
-#include "flyfrm.hxx"
-#include "frmfmt.hxx"
-#include "dflyobj.hxx"
-#include "dcontact.hxx"
-#include "textboxhelper.hxx"
-#include "frmatr.hxx"
-#include "viewsh.hxx"
-#include "viewimp.hxx"
-#include "dview.hxx"
-#include "dpage.hxx"
-#include "doc.hxx"
-#include "mdiexp.hxx"
+#include <swtypes.hxx>
+#include <pagefrm.hxx>
+#include <rootfrm.hxx>
+#include <cntfrm.hxx>
+#include <flyfrm.hxx>
+#include <frmfmt.hxx>
+#include <dflyobj.hxx>
+#include <dcontact.hxx>
+#include <textboxhelper.hxx>
+#include <frmatr.hxx>
+#include <viewsh.hxx>
+#include <viewimp.hxx>
+#include <dview.hxx>
+#include <dpage.hxx>
+#include <doc.hxx>
+#include <mdiexp.hxx>
 #include <ndole.hxx>
 #include <ndgrf.hxx>
 #include <fmtanchr.hxx>
-#include "shellres.hxx"
+#include <shellres.hxx>
 #include <IDocumentUndoRedo.hxx>
 #include <DocumentSettingManager.hxx>
 #include <IDocumentLayoutAccess.hxx>
diff --git a/sw/source/core/edit/edfmt.cxx b/sw/source/core/edit/edfmt.cxx
index 329a25d43b7f..81722996aba6 100644
--- a/sw/source/core/edit/edfmt.cxx
+++ b/sw/source/core/edit/edfmt.cxx
@@ -17,17 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "doc.hxx"
+#include <doc.hxx>
 #include <IDocumentStylePoolAccess.hxx>
-#include "editsh.hxx"
-#include "swtable.hxx"
-#include "pam.hxx"
+#include <editsh.hxx>
+#include <swtable.hxx>
+#include <pam.hxx>
 #include <docary.hxx>
 #include <fchrfmt.hxx>
 #include <frmfmt.hxx>
 #include <charfmt.hxx>
-#include "ndtxt.hxx"
-#include "hints.hxx"
+#include <ndtxt.hxx>
+#include <hints.hxx>
 
 sal_uInt16 SwEditShell::GetCharFormatCount() const
 {
diff --git a/sw/source/core/edit/edredln.cxx b/sw/source/core/edit/edredln.cxx
index fe92707fb6a2..e99aa5c36ae3 100644
--- a/sw/source/core/edit/edredln.cxx
+++ b/sw/source/core/edit/edredln.cxx
@@ -19,12 +19,12 @@
 
 #include <docary.hxx>
 #include <vcl/window.hxx>
-#include "redline.hxx"
-#include "doc.hxx"
-#include "swundo.hxx"
-#include "editsh.hxx"
-#include "edimp.hxx"
-#include "frmtool.hxx"
+#include <redline.hxx>
+#include <doc.hxx>
+#include <swundo.hxx>
+#include <editsh.hxx>
+#include <edimp.hxx>
+#include <frmtool.hxx>
 
 RedlineFlags SwEditShell::GetRedlineFlags() const
 {
diff --git a/sw/source/core/fields/fldlst.cxx b/sw/source/core/fields/fldlst.cxx
index 438843d5a9ab..2330da1c0066 100644
--- a/sw/source/core/fields/fldlst.cxx
+++ b/sw/source/core/fields/fldlst.cxx
@@ -18,17 +18,17 @@
  */
 
 #include <calbck.hxx>
-#include "editsh.hxx"
-#include "doc.hxx"
+#include <editsh.hxx>
+#include <doc.hxx>
 #include <IDocumentFieldsAccess.hxx>
 #include <docary.hxx>
 #include <fmtfld.hxx>
 #include <txtfld.hxx>
-#include "edimp.hxx"
-#include "expfld.hxx"
-#include "pam.hxx"
-#include "docfld.hxx"
-#include "ndtxt.hxx"
+#include <edimp.hxx>
+#include <expfld.hxx>
+#include <pam.hxx>
+#include <docfld.hxx>
+#include <ndtxt.hxx>
 
 // sort input values
 
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 27893c02fae6..50220a561a79 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <svx/strings.hrc>
 #include <svx/sdrobjectfilter.hxx>
 #include <svx/svddrgmt.hxx>
@@ -67,27 +67,27 @@
 #include <swmodule.hxx>
 #include <swtable.hxx>
 #include <flyfrms.hxx>
-#include "fesh.hxx"
-#include "rootfrm.hxx"
-#include "pagefrm.hxx"
-#include "sectfrm.hxx"
-#include "doc.hxx"
+#include <fesh.hxx>
+#include <rootfrm.hxx>
+#include <pagefrm.hxx>
+#include <sectfrm.hxx>
+#include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
-#include "dview.hxx"
-#include "dflyobj.hxx"
-#include "dcontact.hxx"
-#include "viewimp.hxx"
-#include "flyfrm.hxx"
-#include "pam.hxx"
-#include "ndole.hxx"
-#include "ndgrf.hxx"
-#include "ndtxt.hxx"
-#include "viewopt.hxx"
-#include "swundo.hxx"
-#include "notxtfrm.hxx"
-#include "txtfrm.hxx"
-#include "txatbase.hxx"
-#include "mdiexp.hxx"
+#include <dview.hxx>
+#include <dflyobj.hxx>
+#include <dcontact.hxx>
+#include <viewimp.hxx>
+#include <flyfrm.hxx>
+#include <pam.hxx>
+#include <ndole.hxx>
+#include <ndgrf.hxx>
+#include <ndtxt.hxx>
+#include <viewopt.hxx>
+#include <swundo.hxx>
+#include <notxtfrm.hxx>
+#include <txtfrm.hxx>
+#include <txatbase.hxx>
+#include <mdiexp.hxx>
 #include <sortedobjs.hxx>
 #include <HandleAnchorNodeChg.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/sw/source/core/inc/SwGrammarMarkUp.hxx b/sw/source/core/inc/SwGrammarMarkUp.hxx
index ac4e91632b72..f37605556353 100644
--- a/sw/source/core/inc/SwGrammarMarkUp.hxx
+++ b/sw/source/core/inc/SwGrammarMarkUp.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_SWGRAMMARMARKUP_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_SWGRAMMARMARKUP_HXX
 
-#include <wrong.hxx>
+#include "wrong.hxx"
 #include <vector>
 
 /* SwGrammarMarkUp extends the functionality of a "normal" SwWrongList by memorizing
diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx
index bce940971467..e294eb9e82f7 100644
--- a/sw/source/core/inc/SwXMLTextBlocks.hxx
+++ b/sw/source/core/inc/SwXMLTextBlocks.hxx
@@ -22,7 +22,7 @@
 
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
-#include <swblocks.hxx>
+#include "swblocks.hxx"
 #include <o3tl/typed_flags_set.hxx>
 
 class SwPaM;
diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx
index db35e88e3053..382cb5a57591 100644
--- a/sw/source/core/inc/anchoredobjectposition.hxx
+++ b/sw/source/core/inc/anchoredobjectposition.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_ANCHOREDOBJECTPOSITION_HXX
 
 #include <swtypes.hxx>
-#include <frame.hxx>
+#include "frame.hxx"
 
 class SdrObject;
 class SwFrame;
diff --git a/sw/source/core/inc/annotationmark.hxx b/sw/source/core/inc/annotationmark.hxx
index c4d164ed5158..a74470b6704a 100644
--- a/sw/source/core/inc/annotationmark.hxx
+++ b/sw/source/core/inc/annotationmark.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_ANNOTATIONMARK_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_ANNOTATIONMARK_HXX
 
-#include <bookmrk.hxx>
+#include "bookmrk.hxx"
 #include <rtl/ustring.hxx>
 
 class SwFormatField;
diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx
index 6771253de3f0..bc0c2197975c 100644
--- a/sw/source/core/inc/ascharanchoredobjectposition.hxx
+++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_ASCHARANCHOREDOBJECTPOSITION_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_ASCHARANCHOREDOBJECTPOSITION_HXX
 
-#include <anchoredobjectposition.hxx>
+#include "anchoredobjectposition.hxx"
 #include <sal/types.h>
 #include <swtypes.hxx>
 #include <swrect.hxx>
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index 72d544d13606..394c93d67876 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -22,8 +22,8 @@
 
 #include "frame.hxx"
 #include "flowfrm.hxx"
-#include "cshtyp.hxx"
-#include "node.hxx"
+#include <cshtyp.hxx>
+#include <node.hxx>
 
 class SwLayoutFrame;
 class SwContentNode;
diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx
index d98fdf7c30db..2d7765749626 100644
--- a/sw/source/core/inc/crossrefbookmark.hxx
+++ b/sw/source/core/inc/crossrefbookmark.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_CROSSREFBOOKMARK_HXX
 
 #include <IMark.hxx>
-#include <bookmrk.hxx>
+#include "bookmrk.hxx"
 #include <rtl/ustring.hxx>
 #include <vcl/keycod.hxx>
 
diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx
index 4f7b9f74153f..95e491782ff6 100644
--- a/sw/source/core/inc/dbg_lay.hxx
+++ b/sw/source/core/inc/dbg_lay.hxx
@@ -61,7 +61,7 @@ enum class DbgAction {
 
 #include <tools/solar.h>
 
-#include "swtypes.hxx"
+#include <swtypes.hxx>
 
 class SwImplProtocol;
 class SwFrame;
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 4f390980dc6d..d966f8716311 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -22,7 +22,7 @@
 
 #include "layfrm.hxx"
 #include <vector>
-#include "frmfmt.hxx"
+#include <frmfmt.hxx>
 #include <anchoredobject.hxx>
 
 class SwPageFrame;
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index e6c4fa47f0e7..6baf1c2d56ad 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -23,7 +23,7 @@
 #include <vcl/font.hxx>
 #include <vcl/vclptr.hxx>
 #include <tools/mempool.hxx>
-#include "swtypes.hxx"
+#include <swtypes.hxx>
 #include "swcache.hxx"
 
 class OutputDevice;
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index aaae7fe92f53..bf3ea789dd4d 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -23,12 +23,12 @@
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
 #include <editeng/borderline.hxx>
-#include "swtypes.hxx"
-#include "swrect.hxx"
-#include "calbck.hxx"
+#include <swtypes.hxx>
+#include <swrect.hxx>
+#include <calbck.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include "IDocumentDrawModelAccess.hxx"
+#include <IDocumentDrawModelAccess.hxx>
 
 #include <com/sun/star/style/TabStop.hpp>
 
diff --git a/sw/source/core/inc/frminf.hxx b/sw/source/core/inc/frminf.hxx
index dbae9fbaeeef..360cba17a4cd 100644
--- a/sw/source/core/inc/frminf.hxx
+++ b/sw/source/core/inc/frminf.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_FRMINF_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_FRMINF_HXX
 
-#include "swtypes.hxx"
+#include <swtypes.hxx>
 
 class SwTextFrame;
 class SwPaM;
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index f0351fa6de29..a382ba3e5f25 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -20,13 +20,13 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_FRMTOOL_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_FRMTOOL_HXX
 
-#include "swtypes.hxx"
+#include <swtypes.hxx>
 #include "layfrm.hxx"
-#include "frmatr.hxx"
+#include <frmatr.hxx>
 #include "swcache.hxx"
 #include <editeng/lrspitem.hxx>
-#include <swfont.hxx>
-#include <flyfrm.hxx>
+#include "swfont.hxx"
+#include "flyfrm.hxx"
 #include <basegfx/utils/b2dclipstate.hxx>
 
 class SwPageFrame;
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index 51b71f056e16..9a36627ab46a 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -23,8 +23,8 @@
 
 #include <ctime>
 
-#include "swtypes.hxx"
-#include "swrect.hxx"
+#include <swtypes.hxx>
+#include <swrect.hxx>
 
 class SwRootFrame;
 class SwLayoutFrame;
diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx
index 00b5bf1ed2d6..2890bb0e3dc4 100644
--- a/sw/source/core/inc/layouter.hxx
+++ b/sw/source/core/inc/layouter.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_LAYOUTER_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_LAYOUTER_HXX
 
-#include "swtypes.hxx"
+#include <swtypes.hxx>
 #include <unordered_map>
 
 class SwEndnoter;
diff --git a/sw/source/core/inc/noteurl.hxx b/sw/source/core/inc/noteurl.hxx
index f1379568b037..2edd314e046c 100644
--- a/sw/source/core/inc/noteurl.hxx
+++ b/sw/source/core/inc/noteurl.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_NOTEURL_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_NOTEURL_HXX
 
-#include "swrect.hxx"
+#include <swrect.hxx>
 
 #include <rtl/ustring.hxx>
 
diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx
index 387449fba3c1..802c737eeb21 100644
--- a/sw/source/core/inc/notxtfrm.hxx
+++ b/sw/source/core/inc/notxtfrm.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_NOTXTFRM_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_NOTXTFRM_HXX
 
-#include <cntfrm.hxx>
+#include "cntfrm.hxx"
 
 class SwNoTextNode;
 class OutputDevice;
diff --git a/sw/source/core/inc/observablethread.hxx b/sw/source/core/inc/observablethread.hxx
index 313cc29493e3..900fda37d0c9 100644
--- a/sw/source/core/inc/observablethread.hxx
+++ b/sw/source/core/inc/observablethread.hxx
@@ -23,7 +23,7 @@
 #include <rtl/ref.hxx>
 #include <osl/interlck.h>
 #include <salhelper/simplereferenceobject.hxx>
-#include <ifinishedthreadlistener.hxx>
+#include "ifinishedthreadlistener.hxx"
 #include <memory>
 
 /** class for an observable thread
diff --git a/sw/source/core/inc/retrieveinputstream.hxx b/sw/source/core/inc/retrieveinputstream.hxx
index 7b5a45ab1216..9c6c87640354 100644
--- a/sw/source/core/inc/retrieveinputstream.hxx
+++ b/sw/source/core/inc/retrieveinputstream.hxx
@@ -19,9 +19,9 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_RETRIEVEINPUTSTREAM_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_RETRIEVEINPUTSTREAM_HXX
 
-#include <observablethread.hxx>
+#include "observablethread.hxx"
 #include <rtl/ustring.hxx>
-#include <retrievedinputstreamdata.hxx>
+#include "retrievedinputstreamdata.hxx"
 
 /** class for a thread to retrieve an input stream given by an URL
 
diff --git a/sw/source/core/inc/retrieveinputstreamconsumer.hxx b/sw/source/core/inc/retrieveinputstreamconsumer.hxx
index b29adbc1bad7..2cacf10234c4 100644
--- a/sw/source/core/inc/retrieveinputstreamconsumer.hxx
+++ b/sw/source/core/inc/retrieveinputstreamconsumer.hxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <osl/interlck.h>
-#include <retrievedinputstreamdata.hxx>
+#include "retrievedinputstreamdata.hxx"
 
 class SwGrfNode;
 
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index 02e4c5abf7ff..7601a9699e73 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -22,7 +22,7 @@
 
 #include <vector>
 #include <deque>
-#include "swscanner.hxx"
+#include <swscanner.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
 
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 04804c482269..d9433ccfc3be 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -25,7 +25,7 @@
 #include <tools/gen.hxx>
 #include <editeng/svxfont.hxx>
 #include <swtypes.hxx>
-#include <drawfont.hxx>
+#include "drawfont.hxx"
 #include <editeng/borderline.hxx>
 #include <boost/optional.hpp>
 #include <o3tl/enumarray.hxx>
diff --git a/sw/source/core/inc/threadlistener.hxx b/sw/source/core/inc/threadlistener.hxx
index 0a9dcfec53af..8a5c1e9dbd64 100644
--- a/sw/source/core/inc/threadlistener.hxx
+++ b/sw/source/core/inc/threadlistener.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_THREADLISTENER_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_THREADLISTENER_HXX
 
-#include <ifinishedthreadlistener.hxx>
-#include <observablethread.hxx>
+#include "ifinishedthreadlistener.hxx"
+#include "observablethread.hxx"
 
 class ThreadManager;
 
diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx
index 84c29e08ee9f..6705def95dde 100644
--- a/sw/source/core/inc/threadmanager.hxx
+++ b/sw/source/core/inc/threadmanager.hxx
@@ -28,12 +28,12 @@
 #include <deque>
 #include <cppuhelper/weak.hxx>
 #include <com/sun/star/util/XJobManager.hpp>
-#include <observablethread.hxx>
-#include "cancellablejob.hxx"
-#include <threadlistener.hxx>
+#include "observablethread.hxx"
+#include <cancellablejob.hxx>
+#include "threadlistener.hxx"
 
 #include <memory>
-#include <ifinishedthreadlistener.hxx>
+#include "ifinishedthreadlistener.hxx"
 
 
 /** class to manage threads
diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx
index 2c7adadc5245..01033a6f1e7b 100644
--- a/sw/source/core/inc/tocntntanchoredobjectposition.hxx
+++ b/sw/source/core/inc/tocntntanchoredobjectposition.hxx
@@ -18,7 +18,7 @@
  */
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_TOCNTNTANCHOREDOBJECTPOSITION_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_TOCNTNTANCHOREDOBJECTPOSITION_HXX
-#include <anchoredobjectposition.hxx>
+#include "anchoredobjectposition.hxx"
 
 class SwFrame;
 class SwTextFrame;
diff --git a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx
index 0edb5c217ccf..1b538da1b08f 100644
--- a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx
+++ b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx
@@ -18,7 +18,7 @@
  */
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_TOLAYOUTANCHOREDOBJECTPOSITION_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_TOLAYOUTANCHOREDOBJECTPOSITION_HXX
-#include <anchoredobjectposition.hxx>
+#include "anchoredobjectposition.hxx"
 #include <swtypes.hxx>
 #include <swrect.hxx>
 
diff --git a/sw/source/core/inc/txtfly.hxx b/sw/source/core/inc/txtfly.hxx
index 772cd8d2d493..ad1788f3dd83 100644
--- a/sw/source/core/inc/txtfly.hxx
+++ b/sw/source/core/inc/txtfly.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_TXTFLY_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_TXTFLY_HXX
 
-#include "swtypes.hxx"
-#include "swrect.hxx"
+#include <swtypes.hxx>
+#include <swrect.hxx>
 #include <com/sun/star/text/WrapTextMode.hpp>
 #include <memory>
 #include <vector>
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 429abead817a..dce33a89a882 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <tools/mempool.hxx>
 #include "cntfrm.hxx"
-#include "ndtxt.hxx"
+#include <ndtxt.hxx>
 
 class SwCharRange;
 class SwTextNode;
diff --git a/sw/source/core/inc/txttypes.hxx b/sw/source/core/inc/txttypes.hxx
index 1dd5bff630fe..1633afc07f69 100644
--- a/sw/source/core/inc/txttypes.hxx
+++ b/sw/source/core/inc/txttypes.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_TXTTYPES_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_TXTTYPES_HXX
 
-#include "swtypes.hxx"
+#include <swtypes.hxx>
 
 // Portiontypen
 #define POR_LIN         0x0000
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index 5c6eb130232e..f584f47a067d 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/text/XFlatParagraphIterator.hpp>
 #include <calbck.hxx>
 #include <modeltoviewhelper.hxx>
-#include <unotextmarkup.hxx>
+#include "unotextmarkup.hxx"
 
 #include <set>
 
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 26916c9af1b5..90660e93553f 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -18,12 +18,12 @@
  */
 
 #include <memory>
-#include "rootfrm.hxx"
-#include "pagefrm.hxx"
-#include "viewopt.hxx"
-#include "frmtool.hxx"
-#include "txtftn.hxx"
-#include "fmtftn.hxx"
+#include <rootfrm.hxx>
+#include <pagefrm.hxx>
+#include <viewopt.hxx>
+#include <frmtool.hxx>
+#include <txtftn.hxx>
+#include <fmtftn.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/keepitem.hxx>
 #include <svx/sdtaitm.hxx>
@@ -32,11 +32,11 @@
 #include <fmtanchr.hxx>
 #include <fmtclbl.hxx>
 
-#include "tabfrm.hxx"
-#include "ftnfrm.hxx"
-#include "txtfrm.hxx"
-#include "sectfrm.hxx"
-#include "dbg_lay.hxx"
+#include <tabfrm.hxx>
+#include <ftnfrm.hxx>
+#include <txtfrm.hxx>
+#include <sectfrm.hxx>
+#include <dbg_lay.hxx>
 
 #include <sortedobjs.hxx>
 #include <layouter.hxx>
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index d229164bd5bb..b12b03afdacf 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -21,14 +21,14 @@
 #include <fmtclds.hxx>
 #include <fmtfordr.hxx>
 #include <frmfmt.hxx>
-#include "frmtool.hxx"
-#include "colfrm.hxx"
-#include "pagefrm.hxx"
-#include "bodyfrm.hxx"
-#include "rootfrm.hxx"
-#include "sectfrm.hxx"
+#include <frmtool.hxx>
+#include <colfrm.hxx>
+#include <pagefrm.hxx>
+#include <bodyfrm.hxx>
+#include <rootfrm.hxx>
+#include <sectfrm.hxx>
 #include <calbck.hxx>
-#include "ftnfrm.hxx"
+#include <ftnfrm.hxx>
 #include <IDocumentState.hxx>
 #include <IDocumentLayoutAccess.hxx>
 #include <IDocumentUndoRedo.hxx>
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 6a2ac2799ca4..4e3df4b918a5 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -95,10 +95,10 @@
  * frame types and FrameIds.
  */
 
-#include "dbg_lay.hxx"
+#include <dbg_lay.hxx>
 
-#include "flyfrm.hxx"
-#include "txtfrm.hxx"
+#include <flyfrm.hxx>
+#include <txtfrm.hxx>
 #include <fntcache.hxx>
 
 #include <comphelper/string.hxx>
diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx
index 1bf1c37c1465..56c0b06f6ff4 100644
--- a/sw/source/core/layout/dumpfilter.cxx
+++ b/sw/source/core/layout/dumpfilter.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "dumpfilter.hxx"
+#include <dumpfilter.hxx>
 
 #include <wrtsh.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index 81912ce649db..10d9faf95928 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -17,18 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "pagefrm.hxx"
-#include "rootfrm.hxx"
+#include <pagefrm.hxx>
+#include <rootfrm.hxx>
 #include <cellfrm.hxx>
 #include <rowfrm.hxx>
 #include <swtable.hxx>
 
-#include "tabfrm.hxx"
-#include "sectfrm.hxx"
-#include "flyfrms.hxx"
-#include "ftnfrm.hxx"
-#include "txtftn.hxx"
-#include "fmtftn.hxx"
+#include <tabfrm.hxx>
+#include <sectfrm.hxx>
+#include <flyfrms.hxx>
+#include <ftnfrm.hxx>
+#include <txtftn.hxx>
+#include <fmtftn.hxx>
 #include <txtfrm.hxx>
 #include <calbck.hxx>
 #include <viewopt.hxx>
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index ac9eab002f8a..b7deab921ecf 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -21,14 +21,14 @@
 #include <sal/config.h>
 
 #include <bodyfrm.hxx>
-#include "swtable.hxx"
-#include "rootfrm.hxx"
-#include "pagefrm.hxx"
-#include "viewimp.hxx"
-#include "viewopt.hxx"
-#include "frmtool.hxx"
+#include <swtable.hxx>
+#include <rootfrm.hxx>
+#include <pagefrm.hxx>
+#include <viewimp.hxx>
+#include <viewopt.hxx>
+#include <frmtool.hxx>
 #include <IDocumentFieldsAccess.hxx>
-#include "dcontact.hxx"
+#include <dcontact.hxx>
 #include <editeng/formatbreakitem.hxx>
 #include <editeng/keepitem.hxx>
 #include <fmtsrnd.hxx>
@@ -39,16 +39,16 @@
 #include <fmtftn.hxx>
 #include <editeng/pgrditem.hxx>
 #include <paratr.hxx>
-#include "ftnfrm.hxx"
-#include "txtfrm.hxx"
-#include "tabfrm.hxx"
-#include "pagedesc.hxx"
-#include "layact.hxx"
-#include "flyfrms.hxx"
-#include "sectfrm.hxx"
-#include "section.hxx"
-#include "dbg_lay.hxx"
-#include "lineinfo.hxx"
+#include <ftnfrm.hxx>
+#include <txtfrm.hxx>
+#include <tabfrm.hxx>
+#include <pagedesc.hxx>
+#include <layact.hxx>
+#include <flyfrms.hxx>
+#include <sectfrm.hxx>
+#include <section.hxx>
+#include <dbg_lay.hxx>
+#include <lineinfo.hxx>
 #include <fmtclbl.hxx>
 #include <sortedobjs.hxx>
 #include <layouter.hxx>
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 060285bf6963..36d74c245623 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -41,21 +41,21 @@
 #include <swtable.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdoashp.hxx>
-#include "layouter.hxx"
-#include "pagefrm.hxx"
-#include "rootfrm.hxx"
-#include "viewimp.hxx"
-#include "viewopt.hxx"
-#include "dcontact.hxx"
-#include "dflyobj.hxx"
-#include "dview.hxx"
-#include "frmtool.hxx"
-#include "hints.hxx"
-#include "tabfrm.hxx"
-#include "txtfrm.hxx"
-#include "notxtfrm.hxx"
-#include "flyfrms.hxx"
-#include "sectfrm.hxx"
+#include <layouter.hxx>
+#include <pagefrm.hxx>
+#include <rootfrm.hxx>
+#include <viewimp.hxx>
+#include <viewopt.hxx>
+#include <dcontact.hxx>
+#include <dflyobj.hxx>
+#include <dview.hxx>
+#include <frmtool.hxx>
+#include <hints.hxx>
+#include <tabfrm.hxx>
+#include <txtfrm.hxx>
+#include <notxtfrm.hxx>
+#include <flyfrms.hxx>
+#include <sectfrm.hxx>
 #include <vcl/svapp.hxx>
 #include <calbck.hxx>
 #include <IDocumentSettingAccess.hxx>
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index dad4f15c13cf..31a6a2b0c742 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -18,24 +18,24 @@
  */
 
 #include <tools/bigint.hxx>
-#include "pagefrm.hxx"
-#include "txtfrm.hxx"
+#include <pagefrm.hxx>
+#include <txtfrm.hxx>
 #include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <IDocumentDrawModelAccess.hxx>
-#include "frmtool.hxx"
-#include "dflyobj.hxx"
-#include "hints.hxx"
+#include <frmtool.hxx>
+#include <dflyobj.hxx>
+#include <hints.hxx>
 #include <fmtornt.hxx>
 #include <fmtfsize.hxx>
 #include <fmtsrnd.hxx>
 #include <txatbase.hxx>
 
-#include "tabfrm.hxx"
-#include "flyfrms.hxx"
-#include "crstate.hxx"
-#include "sectfrm.hxx"
+#include <tabfrm.hxx>
+#include <flyfrms.hxx>
+#include <crstate.hxx>
+#include <sectfrm.hxx>
 
 #include <tocntntanchoredobjectposition.hxx>
 #include <dcontact.hxx>
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index a18562d2c28c..9d62960e6fd5 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "doc.hxx"
-#include "frmtool.hxx"
-#include "hints.hxx"
+#include <doc.hxx>
+#include <frmtool.hxx>
+#include <hints.hxx>
 #include <fmtornt.hxx>
-#include "rootfrm.hxx"
-#include "txtfrm.hxx"
-#include "flyfrms.hxx"
+#include <rootfrm.hxx>
+#include <txtfrm.hxx>
+#include <flyfrms.hxx>
 #include <dflyobj.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <IDocumentDrawModelAccess.hxx>
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 8c370891378a..4d27654eaf3c 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -17,23 +17,23 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "pagefrm.hxx"
-#include "rootfrm.hxx"
-#include "cntfrm.hxx"
-#include "dflyobj.hxx"
-#include "dcontact.hxx"
-#include "ftnfrm.hxx"
-#include "frmtool.hxx"
-#include "hints.hxx"
-#include "sectfrm.hxx"
+#include <pagefrm.hxx>
+#include <rootfrm.hxx>
+#include <cntfrm.hxx>
+#include <dflyobj.hxx>
+#include <dcontact.hxx>
+#include <ftnfrm.hxx>
+#include <frmtool.hxx>
+#include <hints.hxx>
+#include <sectfrm.hxx>
 
 #include <svx/svdpage.hxx>
 #include <editeng/ulspitem.hxx>
 #include <fmtornt.hxx>
 #include <fmtfsize.hxx>
-#include "ndole.hxx"
-#include "tabfrm.hxx"
-#include "flyfrms.hxx"
+#include <ndole.hxx>
+#include <tabfrm.hxx>
+#include <flyfrms.hxx>
 #include <fmtfollowtextflow.hxx>
 #include <environmentofanchoredobject.hxx>
 #include <sortedobjs.hxx>
diff --git a/sw/source/core/layout/flypos.cxx b/sw/source/core/layout/flypos.cxx
index ca3a8c07748f..0f470f26fa40 100644
--- a/sw/source/core/layout/flypos.cxx
+++ b/sw/source/core/layout/flypos.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "doc.hxx"
+#include <doc.hxx>
 #include <IDocumentLayoutAccess.hxx>
 #include <docary.hxx>
-#include "dcontact.hxx"
-#include "flyfrm.hxx"
-#include "dflyobj.hxx"
+#include <dcontact.hxx>
+#include <flyfrm.hxx>
+#include <dflyobj.hxx>
 #include <calbck.hxx>
 
 bool SwPosFlyFrameCmp::operator()(const SwPosFlyFramePtr& rA, const SwPosFlyFramePtr& rB) const
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index dde40a20ab2a..d95e755899b2 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -33,27 +33,27 @@
 #include <docary.hxx>
 #include <lineinfo.hxx>
 #include <swmodule.hxx>
-#include "pagefrm.hxx"
-#include "colfrm.hxx"
-#include "fesh.hxx"
-#include "viewimp.hxx"
-#include "viewopt.hxx"
-#include "dflyobj.hxx"
-#include "dcontact.hxx"
-#include "frmtool.hxx"
-#include "tabfrm.hxx"
-#include "rowfrm.hxx"
-#include "ftnfrm.hxx"
-#include "txtfrm.hxx"
-#include "notxtfrm.hxx"
-#include "flyfrms.hxx"
-#include "layact.hxx"
-#include "pagedesc.hxx"
-#include "section.hxx"
-#include "sectfrm.hxx"
-#include "node2lay.hxx"
-#include "ndole.hxx"
-#include "hints.hxx"
+#include <pagefrm.hxx>
+#include <colfrm.hxx>
+#include <fesh.hxx>
+#include <viewimp.hxx>
+#include <viewopt.hxx>
+#include <dflyobj.hxx>
+#include <dcontact.hxx>
+#include <frmtool.hxx>
+#include <tabfrm.hxx>
+#include <rowfrm.hxx>
+#include <ftnfrm.hxx>
+#include <txtfrm.hxx>
+#include <notxtfrm.hxx>
+#include <flyfrms.hxx>
+#include <layact.hxx>
+#include <pagedesc.hxx>
+#include <section.hxx>
+#include <sectfrm.hxx>
+#include <node2lay.hxx>
+#include <ndole.hxx>
+#include <hints.hxx>
 #include "layhelp.hxx"
 #include <laycache.hxx>
 #include <rootfrm.hxx>
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 7adcead6adff..d1a973f03033 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -31,7 +31,7 @@
 #include <ftninfo.hxx>
 #include <sectfrm.hxx>
 #include <objectformatter.hxx>
-#include "viewopt.hxx"
+#include <viewopt.hxx>
 #include <calbck.hxx>
 
 #define ENDNOTE 0x80000000
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index fb51dcb40d6e..150730c3423b 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -17,18 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "pagefrm.hxx"
+#include <pagefrm.hxx>
 #include <fmtcntnt.hxx>
 #include <fmthdft.hxx>
 #include <fmtfsize.hxx>
-#include "viewopt.hxx"
-#include "hffrm.hxx"
-#include "rootfrm.hxx"
-#include "txtfrm.hxx"
-#include "sectfrm.hxx"
-#include "flyfrm.hxx"
-#include "frmtool.hxx"
-#include "hfspacingitem.hxx"
+#include <viewopt.hxx>
+#include <hffrm.hxx>
+#include <rootfrm.hxx>
+#include <txtfrm.hxx>
+#include <sectfrm.hxx>
+#include <flyfrm.hxx>
+#include <frmtool.hxx>
+#include <hfspacingitem.hxx>
 #include <sortedobjs.hxx>
 #include <objectformatter.hxx>
 #include <o3tl/make_unique.hxx>
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 70047724f494..bae8b8390df1 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -20,18 +20,18 @@
 #include <config_features.h>
 
 #include <ctime>
-#include "rootfrm.hxx"
-#include "pagefrm.hxx"
-#include "viewimp.hxx"
-#include "crsrsh.hxx"
-#include "dflyobj.hxx"
-#include "frmtool.hxx"
-#include "dcontact.hxx"
-#include "viewopt.hxx"
-#include "dbg_lay.hxx"
-#include "layouter.hxx"
-#include "docstat.hxx"
-#include "swevent.hxx"
+#include <rootfrm.hxx>
+#include <pagefrm.hxx>
+#include <viewimp.hxx>
+#include <crsrsh.hxx>
+#include <dflyobj.hxx>
+#include <frmtool.hxx>
+#include <dcontact.hxx>
+#include <viewopt.hxx>
+#include <dbg_lay.hxx>
+#include <layouter.hxx>
+#include <docstat.hxx>
+#include <swevent.hxx>
 #include <IDocumentStatistics.hxx>
 #include <IDocumentLayoutAccess.hxx>
 
@@ -42,18 +42,18 @@
 #include <editeng/opaqitem.hxx>
 #include <SwSmartTagMgr.hxx>
 
-#include "layact.hxx"
+#include <layact.hxx>
 #include <swwait.hxx>
 #include <fmtsrnd.hxx>
 #include <docsh.hxx>
 
-#include "tabfrm.hxx"
-#include "ftnfrm.hxx"
-#include "txtfrm.hxx"
-#include "notxtfrm.hxx"
-#include "flyfrms.hxx"
-#include "mdiexp.hxx"
-#include "sectfrm.hxx"
+#include <tabfrm.hxx>
+#include <ftnfrm.hxx>
+#include <txtfrm.hxx>
+#include <notxtfrm.hxx>
+#include <flyfrms.hxx>
+#include <mdiexp.hxx>
+#include <sectfrm.hxx>
 #include <acmplwrd.hxx>
 #include <sortedobjs.hxx>
 #include <objectformatter.hxx>
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index e417698fb0e5..fb3b14b403b7 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -38,7 +38,7 @@
 #include <frmtool.hxx>
 #include <dflyobj.hxx>
 #include <dcontact.hxx>
-#include "viewopt.hxx"
+#include <viewopt.hxx>
 #include <flyfrm.hxx>
 #include <sortedobjs.hxx>
 
diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx
index ec0a1d2e8d77..c098937dcb99 100644
--- a/sw/source/core/layout/layouter.cxx
+++ b/sw/source/core/layout/layouter.cxx
@@ -18,12 +18,12 @@
  */
 
 #include <memory>
-#include "layouter.hxx"
-#include "doc.hxx"
-#include "sectfrm.hxx"
-#include "pagefrm.hxx"
-#include "ftnfrm.hxx"
-#include "txtfrm.hxx"
+#include <layouter.hxx>
+#include <doc.hxx>
+#include <sectfrm.hxx>
+#include <pagefrm.hxx>
+#include <ftnfrm.hxx>
+#include <txtfrm.hxx>
 #include <IDocumentLayoutAccess.hxx>
 
 #include <movedfwdfrmsbyobjpos.hxx>
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index cb11e045f5ad..23c068c0dd7f 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -34,7 +34,7 @@
 #include <sectfrm.hxx>
 #include <notxtfrm.hxx>
 #include <pagedesc.hxx>
-#include "viewimp.hxx"
+#include <viewimp.hxx>
 #include <hints.hxx>
 #include <viewopt.hxx>
 #include <set>
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index c1d166461b22..d689eaf6e4df 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -35,24 +35,24 @@
 #include <edtwin.hxx>
 #include <docary.hxx>
 
-#include "viewimp.hxx"
-#include "pagefrm.hxx"
-#include "rootfrm.hxx"
+#include <viewimp.hxx>
+#include <pagefrm.hxx>
+#include <rootfrm.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <IDocumentFieldsAccess.hxx>
-#include "dcontact.hxx"
-#include "hints.hxx"
+#include <dcontact.hxx>
+#include <hints.hxx>
 #include <FrameControlsManager.hxx>
 
-#include "ftnidx.hxx"
-#include "bodyfrm.hxx"
-#include "ftnfrm.hxx"
-#include "tabfrm.hxx"
-#include "txtfrm.hxx"
-#include "layact.hxx"
-#include "flyfrms.hxx"
-#include "htmltbl.hxx"
-#include "pagedesc.hxx"
+#include <ftnidx.hxx>
+#include <bodyfrm.hxx>
+#include <ftnfrm.hxx>
+#include <tabfrm.hxx>
+#include <txtfrm.hxx>
+#include <layact.hxx>
+#include <flyfrms.hxx>
+#include <htmltbl.hxx>
+#include <pagedesc.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <sortedobjs.hxx>
 #include <calbck.hxx>
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index e4feaa131026..022a56a26d93 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -78,7 +78,7 @@
 
 #include <svtools/borderhelper.hxx>
 
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/borderlineprimitive2d.hxx>
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index d2bf1a68815b..3dd775fd87a8 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -24,21 +24,21 @@
 #include <txtftn.hxx>
 #include <fmtftn.hxx>
 #include <fmtclbl.hxx>
-#include "sectfrm.hxx"
-#include "cellfrm.hxx"
-#include "section.hxx"
+#include <sectfrm.hxx>
+#include <cellfrm.hxx>
+#include <section.hxx>
 #include <IDocumentSettingAccess.hxx>
-#include "rootfrm.hxx"
-#include "pagefrm.hxx"
-#include "txtfrm.hxx"
-#include "fmtclds.hxx"
-#include "colfrm.hxx"
-#include "tabfrm.hxx"
-#include "ftnfrm.hxx"
-#include "layouter.hxx"
-#include "dbg_lay.hxx"
-#include "viewopt.hxx"
-#include "viewimp.hxx"
+#include <rootfrm.hxx>
+#include <pagefrm.hxx>
+#include <txtfrm.hxx>
+#include <fmtclds.hxx>
+#include <colfrm.hxx>
+#include <tabfrm.hxx>
+#include <ftnfrm.hxx>
+#include <layouter.hxx>
+#include <dbg_lay.hxx>
+#include <viewopt.hxx>
+#include <viewimp.hxx>
 #include <editeng/brushitem.hxx>
 #include <fmtftntx.hxx>
 #include <flyfrms.hxx>
diff --git a/sw/source/core/layout/softpagebreak.cxx b/sw/source/core/layout/softpagebreak.cxx
index 394c0116fd65..051364d935e4 100644
--- a/sw/source/core/layout/softpagebreak.cxx
+++ b/sw/source/core/layout/softpagebreak.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "txtfrm.hxx"
-#include "pagefrm.hxx"
-#include "swtable.hxx"
-#include "frmfmt.hxx"
-#include "rowfrm.hxx"
-#include "tabfrm.hxx"
+#include <txtfrm.hxx>
+#include <pagefrm.hxx>
+#include <swtable.hxx>
+#include <frmfmt.hxx>
+#include <rowfrm.hxx>
+#include <tabfrm.hxx>
 #include <calbck.hxx>
 
 void SwTextNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 14222bd8531f..7bbaa6ddd127 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -17,18 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "pagefrm.hxx"
-#include "rootfrm.hxx"
+#include <pagefrm.hxx>
+#include <rootfrm.hxx>
 #include <IDocumentFieldsAccess.hxx>
-#include "viewimp.hxx"
-#include "swtable.hxx"
-#include "dflyobj.hxx"
+#include <viewimp.hxx>
+#include <swtable.hxx>
+#include <dflyobj.hxx>
 #include <anchoreddrawobject.hxx>
 #include <fetab.hxx>
 #include <fmtanchr.hxx>
-#include "viewopt.hxx"
-#include "hints.hxx"
-#include "dbg_lay.hxx"
+#include <viewopt.hxx>
+#include <hints.hxx>
+#include <dbg_lay.hxx>
 #include <ftnidx.hxx>
 #include <svl/itemiter.hxx>
 #include <editeng/keepitem.hxx>
@@ -42,13 +42,13 @@
 #include <fmtpdsc.hxx>
 #include <fmtfsize.hxx>
 #include <swtblfmt.hxx>
-#include "tabfrm.hxx"
-#include "rowfrm.hxx"
-#include "cellfrm.hxx"
-#include "flyfrms.hxx"
-#include "txtfrm.hxx"
-#include "htmltbl.hxx"
-#include "sectfrm.hxx"
+#include <tabfrm.hxx>
+#include <rowfrm.hxx>
+#include <cellfrm.hxx>
+#include <flyfrms.hxx>
+#include <txtfrm.hxx>
+#include <htmltbl.hxx>
+#include <sectfrm.hxx>
 #include <fmtfollowtextflow.hxx>
 #include <sortedobjs.hxx>
 #include <objectformatter.hxx>
diff --git a/sw/source/core/layout/unusedf.cxx b/sw/source/core/layout/unusedf.cxx
index bf9b4be70113..4ad3f56bfee2 100644
--- a/sw/source/core/layout/unusedf.cxx
+++ b/sw/source/core/layout/unusedf.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "rootfrm.hxx"
-#include "cntfrm.hxx"
-#include "flyfrm.hxx"
+#include <rootfrm.hxx>
+#include <cntfrm.hxx>
+#include <flyfrm.hxx>
 
 void SwFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAttrs * )
 {
diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx
index aadf0dced20d..50273eed834a 100644
--- a/sw/source/core/layout/virtoutp.cxx
+++ b/sw/source/core/layout/virtoutp.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "virtoutp.hxx"
-#include "viewopt.hxx"
-#include "rootfrm.hxx"
+#include <viewopt.hxx>
+#include <rootfrm.hxx>
 
 /* The SWLayVout class manages the virtual output devices.
  * RootFrame has a static member of this class which is created in FrameInit
diff --git a/sw/source/core/layout/virtoutp.hxx b/sw/source/core/layout/virtoutp.hxx
index 17ec8841f5c3..d690f31628ef 100644
--- a/sw/source/core/layout/virtoutp.hxx
+++ b/sw/source/core/layout/virtoutp.hxx
@@ -21,8 +21,8 @@
 
 #include <vcl/virdev.hxx>
 
-#include "swtypes.hxx"
-#include "swrect.hxx"
+#include <swtypes.hxx>
+#include <swrect.hxx>
 
 class SwViewShell;
 #define VIRTUALHEIGHT 64
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index d84100681f61..4ed44df2f38b 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -27,7 +27,7 @@
 #include <anchoreddrawobject.hxx>
 #include <fmtanchr.hxx>
 #include <viewimp.hxx>
-#include "viewopt.hxx"
+#include <viewopt.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <IDocumentFieldsAccess.hxx>
 #include <fesh.hxx>
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index 2bf253500f5c..15a57491ad3f 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -24,9 +24,9 @@
 #include <pagefrm.hxx>
 #include <sectfrm.hxx>
 #include <tabfrm.hxx>
-#include "rootfrm.hxx"
-#include "viewopt.hxx"
-#include "viewsh.hxx"
+#include <rootfrm.hxx>
+#include <viewopt.hxx>
+#include <viewsh.hxx>
 #include <frmfmt.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <fmtsrnd.hxx>
diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
index df3ad4686991..f0b5d6e2a297 100644
--- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
@@ -28,9 +28,9 @@
 #include <fmtsrnd.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <frmatr.hxx>
-#include "viewsh.hxx"
-#include "viewopt.hxx"
-#include "rootfrm.hxx"
+#include <viewsh.hxx>
+#include <viewopt.hxx>
+#include <rootfrm.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/ulspitem.hxx>
 
diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
index c5eb8ecefb36..2ed6c4812ba5 100644
--- a/sw/source/core/para/paratr.cxx
+++ b/sw/source/core/para/paratr.cxx
@@ -17,16 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <swtypes.hxx>
-#include "unomid.h"
+#include <unomid.h>
 #include <com/sun/star/style/DropCapFormat.hpp>
 #include <o3tl/any.hxx>
 #include <unostyle.hxx>
 #include <SwStyleNameMapper.hxx>
-#include "paratr.hxx"
-#include "charfmt.hxx"
-#include "cmdid.h"
+#include <paratr.hxx>
+#include <charfmt.hxx>
+#include <cmdid.h>
 #include <libxml/xmlwriter.h>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/sw3io/swacorr.cxx b/sw/source/core/sw3io/swacorr.cxx
index 6f90feee716d..7f9b79c45d9e 100644
--- a/sw/source/core/sw3io/swacorr.cxx
+++ b/sw/source/core/sw3io/swacorr.cxx
@@ -19,7 +19,7 @@
 
 #include <swacorr.hxx>
 #include <swblocks.hxx>
-#include "SwXMLTextBlocks.hxx"
+#include <SwXMLTextBlocks.hxx>
 #include <swerror.h>
 #include <docsh.hxx>
 #include <editsh.hxx>
diff --git a/sw/source/core/text/SwGrammarMarkUp.cxx b/sw/source/core/text/SwGrammarMarkUp.cxx
index c5d57d54ce67..a752619d8f81 100644
--- a/sw/source/core/text/SwGrammarMarkUp.cxx
+++ b/sw/source/core/text/SwGrammarMarkUp.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "SwGrammarMarkUp.hxx"
+#include <SwGrammarMarkUp.hxx>
 
 SwGrammarMarkUp::~SwGrammarMarkUp()
 {
diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx
index dc870ff98313..b3a707e8d671 100644
--- a/sw/source/core/text/blink.cxx
+++ b/sw/source/core/text/blink.cxx
@@ -18,10 +18,10 @@
  */
 
 #include <memory>
-#include "viewsh.hxx"
-#include "rootfrm.hxx"
-#include "txtfrm.hxx"
-#include "blink.hxx"
+#include <viewsh.hxx>
+#include <rootfrm.hxx>
+#include <txtfrm.hxx>
+#include <blink.hxx>
 #include "porlin.hxx"
 #include "porlay.hxx"
 
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 28c3d20499d2..955f8bae081f 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ndtxt.hxx"
-#include "pam.hxx"
-#include "frmtool.hxx"
-#include "viewopt.hxx"
-#include "paratr.hxx"
-#include "rootfrm.hxx"
-#include "pagefrm.hxx"
-#include "colfrm.hxx"
-#include "swtypes.hxx"
+#include <ndtxt.hxx>
+#include <pam.hxx>
+#include <frmtool.hxx>
+#include <viewopt.hxx>
+#include <paratr.hxx>
+#include <rootfrm.hxx>
+#include <pagefrm.hxx>
+#include <colfrm.hxx>
+#include <swtypes.hxx>
 #include <sfx2/printer.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/tstpitem.hxx>
@@ -38,13 +38,13 @@
 
 #include <unicode/ubidi.h>
 
-#include "txtfrm.hxx"
+#include <txtfrm.hxx>
 #include "inftxt.hxx"
 #include "itrtxt.hxx"
-#include "crstate.hxx"
-#include "viewsh.hxx"
-#include "swfntcch.hxx"
-#include "flyfrm.hxx"
+#include <crstate.hxx>
+#include <viewsh.hxx>
+#include <swfntcch.hxx>
+#include <flyfrm.hxx>
 
 #define MIN_OFFSET_STEP 10
 
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 25531270642d..14a65417d3e2 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -29,7 +29,7 @@
 #include <fmtline.hxx>
 #include <lineinfo.hxx>
 #include <charfmt.hxx>
-#include "rootfrm.hxx"
+#include <rootfrm.hxx>
 #include <pagefrm.hxx>
 #include <viewsh.hxx>
 #include <viewimp.hxx>
diff --git a/sw/source/core/text/guess.hxx b/sw/source/core/text/guess.hxx
index 3590976ad638..b5d76688a5ce 100644
--- a/sw/source/core/text/guess.hxx
+++ b/sw/source/core/text/guess.hxx
@@ -21,8 +21,8 @@
 #include <memory>
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 
-#include "swtypes.hxx"
-#include "breakit.hxx"
+#include <swtypes.hxx>
+#include <breakit.hxx>
 #include "porrst.hxx"
 
 class SwTextFormatInfo;
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index f69df5dd0402..f84a0ee7c69b 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -61,7 +61,7 @@
 #include <doc.hxx>
 #include <pam.hxx>
 #include <SwGrammarMarkUp.hxx>
-#include "numrule.hxx"
+#include <numrule.hxx>
 #include <EnhancedPDFExportHelper.hxx>
 #include <docufld.hxx>
 #include <frmfmt.hxx>
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 2d6d46400af8..8caa6131f302 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -24,13 +24,13 @@
 
 #include <map>
 
-#include "swtypes.hxx"
-#include "swrect.hxx"
-#include "txtfly.hxx"
-#include "swfont.hxx"
+#include <swtypes.hxx>
+#include <swrect.hxx>
+#include <txtfly.hxx>
+#include <swfont.hxx>
 #include "porlay.hxx"
-#include "txtfrm.hxx"
-#include "ndtxt.hxx"
+#include <txtfrm.hxx>
+#include <ndtxt.hxx>
 #include <editeng/paravertalignitem.hxx>
 #include <sal/log.hxx>
 
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index aab6cb7be73a..f82a3f6d1df2 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -20,8 +20,8 @@
 #include <vcl/outdev.hxx>
 #include <IDocumentSettingAccess.hxx>
 
-#include "frame.hxx"
-#include "paratr.hxx"
+#include <frame.hxx>
+#include <paratr.hxx>
 #include "itrtxt.hxx"
 #include "porglue.hxx"
 #include "porlay.hxx"
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx
index d36eece7b3d5..54aec69f4f4a 100644
--- a/sw/source/core/text/itratr.hxx
+++ b/sw/source/core/text/itratr.hxx
@@ -20,8 +20,8 @@
 #define INCLUDED_SW_SOURCE_CORE_TEXT_ITRATR_HXX
 #include "atrhndl.hxx"
 
-#include "swtypes.hxx"
-#include "swfont.hxx"
+#include <swtypes.hxx>
+#include <swfont.hxx>
 #include "porlay.hxx"
 
 class OutputDevice;
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 73a4d35e9ed4..cdcf139617ea 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
-#include "ndtxt.hxx"
-#include "frmfmt.hxx"
-#include "paratr.hxx"
-#include "flyfrm.hxx"
-#include "pam.hxx"
-#include "swselectionlist.hxx"
+#include <hintids.hxx>
+#include <ndtxt.hxx>
+#include <frmfmt.hxx>
+#include <paratr.hxx>
+#include <flyfrm.hxx>
+#include <pam.hxx>
+#include <swselectionlist.hxx>
 #include <sortedobjs.hxx>
 #include <editeng/protitem.hxx>
 #include <editeng/adjustitem.hxx>
@@ -37,13 +37,13 @@
 #include <pagefrm.hxx>
 
 #include "itrtxt.hxx"
-#include "txtfrm.hxx"
-#include "flyfrms.hxx"
+#include <txtfrm.hxx>
+#include <flyfrms.hxx>
 #include "porglue.hxx"
 #include "porfld.hxx"
 #include "porfly.hxx"
 #include "pordrop.hxx"
-#include "crstate.hxx"
+#include <crstate.hxx>
 #include "pormulti.hxx"
 #include <numrule.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 7e7b1245c534..6b1a631d5240 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 
 #include <memory>
 #include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 7bd3ce8e549e..7b28458dfde3 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
-#include "flyfrm.hxx"
-#include "viewopt.hxx"
-#include "txtatr.hxx"
+#include <hintids.hxx>
+#include <flyfrm.hxx>
+#include <viewopt.hxx>
+#include <txtatr.hxx>
 #include <tools/multisel.hxx>
 #include <editeng/escapementitem.hxx>
 #include <editeng/udlnitem.hxx>
@@ -39,19 +39,19 @@
 #include <EnhancedPDFExportHelper.hxx>
 #include <IDocumentSettingAccess.hxx>
 
-#include "flyfrms.hxx"
-#include "viewsh.hxx"
+#include <flyfrms.hxx>
+#include <viewsh.hxx>
 #include "itrpaint.hxx"
-#include "txtfrm.hxx"
-#include "txtfly.hxx"
-#include "swfont.hxx"
+#include <txtfrm.hxx>
+#include <txtfly.hxx>
+#include <swfont.hxx>
 #include "txtpaint.hxx"
 #include "portab.hxx"
 #include "porfly.hxx"
 #include "porfld.hxx"
-#include "frmfmt.hxx"
-#include "txatbase.hxx"
-#include "charfmt.hxx"
+#include <frmfmt.hxx>
+#include <txatbase.hxx>
+#include <charfmt.hxx>
 #include "redlnitr.hxx"
 #include "porrst.hxx"
 #include "pormulti.hxx"
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index 90301cac9102..a7bf12dc0c62 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ndtxt.hxx"
-#include "flyfrm.hxx"
-#include "paratr.hxx"
+#include <ndtxt.hxx>
+#include <flyfrm.hxx>
+#include <paratr.hxx>
 #include <vcl/outdev.hxx>
 #include <editeng/paravertalignitem.hxx>
 
@@ -30,7 +30,7 @@
 #include "porfld.hxx"
 
 #include "itrtxt.hxx"
-#include "txtfrm.hxx"
+#include <txtfrm.hxx>
 #include "porfly.hxx"
 
 void SwTextIter::CtorInitTextIter( SwTextFrame *pNewFrame, SwTextInfo *pNewInf )
diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index 6b72b703b6f9..65829dc7a532 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.hxx
@@ -18,7 +18,7 @@
  */
 #ifndef INCLUDED_SW_SOURCE_CORE_TEXT_ITRTXT_HXX
 #define INCLUDED_SW_SOURCE_CORE_TEXT_ITRTXT_HXX
-#include "swtypes.hxx"
+#include <swtypes.hxx>
 #include "itratr.hxx"
 #include "inftxt.hxx"
 
diff --git a/sw/source/core/text/noteurl.cxx b/sw/source/core/text/noteurl.cxx
index 88458513dd0d..80ca8b10fbd9 100644
--- a/sw/source/core/text/noteurl.cxx
+++ b/sw/source/core/text/noteurl.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "noteurl.hxx"
+#include <noteurl.hxx>
 
-#include "swtypes.hxx"
+#include <swtypes.hxx>
 #include <vcl/outdev.hxx>
 #include <svtools/imaprect.hxx>
 #include <svtools/imap.hxx>
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 3cd7d6760e6f..fbcbcaef76d1 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -35,7 +35,7 @@
 #include <docsh.hxx>
 #include <doc.hxx>
 #include <IDocumentSettingAccess.hxx>
-#include "rootfrm.hxx"
+#include <rootfrm.hxx>
 #include <breakit.hxx>
 #include "porrst.hxx"
 #include "porftn.hxx"
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index dae7ecb536f2..38fc08993c0d 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORFLD_HXX
 #define INCLUDED_SW_SOURCE_CORE_TEXT_PORFLD_HXX
 
-#include "swtypes.hxx"
+#include <swtypes.hxx>
 #include "porexp.hxx"
 #include <fmtornt.hxx>
 
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index e2a65bacd8ba..8a4779ab5b15 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dcontact.hxx"
-#include "dflyobj.hxx"
-#include "pam.hxx"
+#include <dcontact.hxx>
+#include <dflyobj.hxx>
+#include <pam.hxx>
 #include "portab.hxx"
-#include "flyfrm.hxx"
-#include "rootfrm.hxx"
-#include "frmfmt.hxx"
-#include "viewsh.hxx"
-#include "textboxhelper.hxx"
+#include <flyfrm.hxx>
+#include <rootfrm.hxx>
+#include <frmfmt.hxx>
+#include <viewsh.hxx>
+#include <textboxhelper.hxx>
 
 #include <vcl/outdev.hxx>
 #include <editeng/lrspitem.hxx>
@@ -34,8 +34,8 @@
 #include <fmtflcnt.hxx>
 #include <fmtornt.hxx>
 #include <frmatr.hxx>
-#include "flyfrms.hxx"
-#include "txatbase.hxx"
+#include <flyfrms.hxx>
+#include <txatbase.hxx>
 #include "porfly.hxx"
 #include "porlay.hxx"
 #include "inftxt.hxx"
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index e6fd152ad05e..fb02a119921d 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -22,7 +22,7 @@
 #include <ascharanchoredobjectposition.hxx>
 
 #include "porglue.hxx"
-#include "flyfrms.hxx"
+#include <flyfrms.hxx>
 
 class SwDrawContact;
 class SwFlyInContentFrame;
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index d63540d16dae..8138195fc825 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "swrect.hxx"
-#include "paratr.hxx"
-#include "viewopt.hxx"
+#include <swrect.hxx>
+#include <paratr.hxx>
+#include <viewopt.hxx>
 #include <SwPortionHandler.hxx>
 #include "porglue.hxx"
 #include "inftxt.hxx"
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 36fde765769f..2d23d2aa9710 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -21,7 +21,7 @@
 #include "itrform2.hxx"
 #include "porglue.hxx"
 #include "porexp.hxx"
-#include "blink.hxx"
+#include <blink.hxx>
 #include "redlnitr.hxx"
 #include "porfly.hxx"
 #include "porrst.hxx"
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index edc3d2b43b53..6aa245d053b4 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -22,9 +22,9 @@
 #include <tools/fract.hxx>
 #include <scriptinfo.hxx>
 
-#include "swrect.hxx"
+#include <swrect.hxx>
 #include "portxt.hxx"
-#include "swfont.hxx"
+#include <swfont.hxx>
 
 #include <vector>
 #include <deque>
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index 6060ea64b264..b1099af21feb 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -25,7 +25,7 @@
 #include "portxt.hxx"
 #include "pormulti.hxx"
 #include "porglue.hxx"
-#include "blink.hxx"
+#include <blink.hxx>
 #if OSL_DEBUG_LEVEL > 0
 
 bool ChkChain( SwLinePortion *pStart )
diff --git a/sw/source/core/text/porref.cxx b/sw/source/core/text/porref.cxx
index 8e8e11aa5738..1ef316e218bc 100644
--- a/sw/source/core/text/porref.cxx
+++ b/sw/source/core/text/porref.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <SwPortionHandler.hxx>
-#include "viewopt.hxx"
+#include <viewopt.hxx>
 
 #include "porref.hxx"
 #include "inftxt.hxx"
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 2dd07c5efb47..3aaac8495ac0 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -42,7 +42,7 @@
 #include "redlnitr.hxx"
 #include "porfly.hxx"
 #include "atrhndl.hxx"
-#include "rootfrm.hxx"
+#include <rootfrm.hxx>
 
 #include <IDocumentRedlineAccess.hxx>
 #include <IDocumentSettingAccess.hxx>
diff --git a/sw/source/core/text/portox.cxx b/sw/source/core/text/portox.cxx
index c5e6802c8a92..dbcbfd150739 100644
--- a/sw/source/core/text/portox.cxx
+++ b/sw/source/core/text/portox.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <SwPortionHandler.hxx>
-#include "viewopt.hxx"
+#include <viewopt.hxx>
 
 #include "portox.hxx"
 #include "inftxt.hxx"
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index 808e32e341e4..2ce260da2dea 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <o3tl/make_unique.hxx>
 #include <svl/whiter.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx
index b8b231b4772d..251e1db3efb1 100644
--- a/sw/source/core/text/redlnitr.hxx
+++ b/sw/source/core/text/redlnitr.hxx
@@ -19,11 +19,11 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_TEXT_REDLNITR_HXX
 #define INCLUDED_SW_SOURCE_CORE_TEXT_REDLNITR_HXX
 
-#include "ndhints.hxx"
+#include <ndhints.hxx>
 
 #include <IDocumentRedlineAccess.hxx>
 
-#include "swfont.hxx"
+#include <swfont.hxx>
 
 #include <cstddef>
 #include <memory>
diff --git a/sw/source/core/text/txtcache.cxx b/sw/source/core/text/txtcache.cxx
index 3c1ef3fc043b..b2f412b07c5b 100644
--- a/sw/source/core/text/txtcache.cxx
+++ b/sw/source/core/text/txtcache.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "txtcache.hxx"
-#include "txtfrm.hxx"
+#include <txtfrm.hxx>
 #include "porlay.hxx"
 
 SwTextLine::SwTextLine( SwTextFrame const *pFrame, SwParaPortion *pNew ) :
diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx
index e6b822f2d6d5..07c30405381a 100644
--- a/sw/source/core/text/txtcache.hxx
+++ b/sw/source/core/text/txtcache.hxx
@@ -21,7 +21,7 @@
 
 #include <sal/types.h>
 #include <tools/mempool.hxx>
-#include "swcache.hxx"
+#include <swcache.hxx>
 #include <memory>
 
 class SwParaPortion;
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 4410fe1dcf88..0e2c12dac3c1 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -17,23 +17,23 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <fmtfld.hxx>
 #include <txtfld.hxx>
 #include <charfmt.hxx>
 
-#include "viewsh.hxx"
-#include "doc.hxx"
-#include "rootfrm.hxx"
-#include "pagefrm.hxx"
-#include "ndtxt.hxx"
-#include "fldbas.hxx"
-#include "viewopt.hxx"
-#include "flyfrm.hxx"
-#include "viewimp.hxx"
-#include "txtatr.hxx"
-#include "swfont.hxx"
-#include "fntcache.hxx"
+#include <viewsh.hxx>
+#include <doc.hxx>
+#include <rootfrm.hxx>
+#include <pagefrm.hxx>
+#include <ndtxt.hxx>
+#include <fldbas.hxx>
+#include <viewopt.hxx>
+#include <flyfrm.hxx>
+#include <viewimp.hxx>
+#include <txtatr.hxx>
+#include <swfont.hxx>
+#include <fntcache.hxx>
 #include "porfld.hxx"
 #include "porftn.hxx"
 #include "porref.hxx"
@@ -41,16 +41,16 @@
 #include "porhyph.hxx"
 #include "porfly.hxx"
 #include "itrform2.hxx"
-#include "chpfld.hxx"
-#include "dbfld.hxx"
-#include "expfld.hxx"
-#include "docufld.hxx"
-#include "pagedesc.hxx"
+#include <chpfld.hxx>
+#include <dbfld.hxx>
+#include <expfld.hxx>
+#include <docufld.hxx>
+#include <pagedesc.hxx>
 #include "pormulti.hxx"
-#include "fmtmeta.hxx"
-#include "reffld.hxx"
-#include "flddat.hxx"
-#include "fmtautofmt.hxx"
+#include <fmtmeta.hxx>
+#include <reffld.hxx>
+#include <flddat.hxx>
+#include <fmtautofmt.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <svl/itemiter.hxx>
 
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 16338b9ea823..76bd7d393555 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -20,21 +20,21 @@
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
 
-#include "dcontact.hxx"
-#include "pagefrm.hxx"
-#include "rootfrm.hxx"
-#include "pam.hxx"
-#include "swregion.hxx"
-#include "dflyobj.hxx"
-#include "flyfrm.hxx"
-#include "frmtool.hxx"
+#include <dcontact.hxx>
+#include <pagefrm.hxx>
+#include <rootfrm.hxx>
+#include <pam.hxx>
+#include <swregion.hxx>
+#include <dflyobj.hxx>
+#include <flyfrm.hxx>
+#include <frmtool.hxx>
 #include "porfly.hxx"
 #include "porfld.hxx"
-#include "txtfly.hxx"
+#include <txtfly.hxx>
 #include "txtpaint.hxx"
-#include "txtatr.hxx"
-#include "notxtfrm.hxx"
-#include "fmtcnct.hxx"
+#include <txtatr.hxx>
+#include <notxtfrm.hxx>
+#include <fmtcnct.hxx>
 #include "inftxt.hxx"
 #include <svx/obj3d.hxx>
 #include <editeng/txtrange.hxx>
@@ -54,9 +54,9 @@
 #include <svx/svdoedge.hxx>
 
 #ifdef DBG_UTIL
-#include "viewsh.hxx"
-#include "viewopt.hxx"
-#include "doc.hxx"
+#include <viewsh.hxx>
+#include <viewopt.hxx>
+#include <doc.hxx>
 #endif
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index dcd0626c92fc..b485e30c0d7f 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -35,7 +35,7 @@
 #include <IDocumentSettingAccess.hxx>
 #include <IDocumentDeviceAccess.hxx>
 #include <IDocumentFieldsAccess.hxx>
-#include "rootfrm.hxx"
+#include <rootfrm.hxx>
 #include <pagefrm.hxx>
 #include <viewsh.hxx>
 #include <pam.hxx>
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 7e5b93b50fc6..6511307b0e92 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "viewsh.hxx"
-#include "doc.hxx"
+#include <viewsh.hxx>
+#include <doc.hxx>
 #include <IDocumentLayoutAccess.hxx>
-#include "pagefrm.hxx"
-#include "rootfrm.hxx"
-#include "ndtxt.hxx"
-#include "txtatr.hxx"
+#include <pagefrm.hxx>
+#include <rootfrm.hxx>
+#include <ndtxt.hxx>
+#include <txtatr.hxx>
 #include <SwPortionHandler.hxx>
 #include <txtftn.hxx>
 #include <flyfrm.hxx>
@@ -39,19 +39,19 @@
 #include <tabfrm.hxx>
 #include <sortedobjs.hxx>
 
-#include "swfont.hxx"
+#include <swfont.hxx>
 #include "porftn.hxx"
 #include "porfly.hxx"
 #include "porlay.hxx"
-#include "txtfrm.hxx"
+#include <txtfrm.hxx>
 #include "itrform2.hxx"
-#include "ftnfrm.hxx"
-#include "pagedesc.hxx"
+#include <ftnfrm.hxx>
+#include <pagedesc.hxx>
 #include "redlnitr.hxx"
-#include "sectfrm.hxx"
-#include "layouter.hxx"
-#include "frmtool.hxx"
-#include "ndindex.hxx"
+#include <sectfrm.hxx>
+#include <layouter.hxx>
+#include <frmtool.hxx>
+#include <ndindex.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx
index 7437de2ea6b6..67c81d185660 100644
--- a/sw/source/core/text/txtinit.cxx
+++ b/sw/source/core/text/txtinit.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "swcache.hxx"
-#include "fntcache.hxx"
-#include "swfntcch.hxx"
-#include "txtfrm.hxx"
+#include <swcache.hxx>
+#include <fntcache.hxx>
+#include <swfntcch.hxx>
+#include <txtfrm.hxx>
 #include "txtcache.hxx"
 #include "porlay.hxx"
 #include "porglue.hxx"
@@ -33,10 +33,10 @@
 #include "porftn.hxx"
 #include "porhyph.hxx"
 #include "pordrop.hxx"
-#include "blink.hxx"
-#include "init.hxx"
-#include "txtfly.hxx"
-#include "dbg_lay.hxx"
+#include <blink.hxx>
+#include <init.hxx>
+#include <txtfly.hxx>
+#include <dbg_lay.hxx>
 
 SwCache *SwTextFrame::pTextCache = nullptr;
 long SwTextFrame::nMinPrtLine = 0;
diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx
index 98d3eb89a830..faa74738c6e9 100644
--- a/sw/source/core/text/txtio.cxx
+++ b/sw/source/core/text/txtio.cxx
@@ -19,12 +19,12 @@
 
 #ifdef DBG_UTIL
 
-#include "viewsh.hxx"
-#include "viewopt.hxx"
-#include "txtatr.hxx"
-#include "txtfrm.hxx"
-#include "rootfrm.hxx"
-#include "flyfrms.hxx"
+#include <viewsh.hxx>
+#include <viewopt.hxx>
+#include <txtatr.hxx>
+#include <txtfrm.hxx>
+#include <rootfrm.hxx>
+#include <flyfrms.hxx>
 #include "inftxt.hxx"
 #include "porexp.hxx"
 #include "porfld.hxx"
@@ -41,7 +41,7 @@
 #include "portxt.hxx"
 #include "pordrop.hxx"
 #include "pormulti.hxx"
-#include "ndhints.hxx"
+#include <ndhints.hxx>
 
 #if OSL_DEBUG_LEVEL < 2
 
diff --git a/sw/source/core/text/txtpaint.cxx b/sw/source/core/text/txtpaint.cxx
index 1bafd80929db..80ada72d494d 100644
--- a/sw/source/core/text/txtpaint.cxx
+++ b/sw/source/core/text/txtpaint.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "txtpaint.hxx"
-#include "swrect.hxx"
-#include "rootfrm.hxx"
+#include <swrect.hxx>
+#include <rootfrm.hxx>
 
 SwSaveClip::~SwSaveClip()
 {
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index cf60c8f1f303..471ba1fedb59 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <comphelper/string.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/tstpitem.hxx>
@@ -26,11 +26,11 @@
 #include <frmatr.hxx>
 #include <SwPortionHandler.hxx>
 
-#include "viewopt.hxx"
+#include <viewopt.hxx>
 #include "portab.hxx"
 #include "inftxt.hxx"
 #include "itrform2.hxx"
-#include "txtfrm.hxx"
+#include <txtfrm.hxx>
 #include <numrule.hxx>
 #include "porfld.hxx"
 #include <memory>
diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx
index 01de602ba732..56f6b7bafc65 100644
--- a/sw/source/core/text/widorp.cxx
+++ b/sw/source/core/text/widorp.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 
-#include "layfrm.hxx"
-#include "ftnboss.hxx"
-#include "ndtxt.hxx"
-#include "paratr.hxx"
+#include <layfrm.hxx>
+#include <ftnboss.hxx>
+#include <ndtxt.hxx>
+#include <paratr.hxx>
 #include <editeng/orphitem.hxx>
 #include <editeng/widwitem.hxx>
 #include <editeng/keepitem.hxx>
@@ -33,11 +33,11 @@
 #include <rowfrm.hxx>
 
 #include "widorp.hxx"
-#include "txtfrm.hxx"
+#include <txtfrm.hxx>
 #include "itrtxt.hxx"
-#include "sectfrm.hxx"
-#include "ftnfrm.hxx"
-#include "pagefrm.hxx"
+#include <sectfrm.hxx>
+#include <ftnfrm.hxx>
+#include <pagefrm.hxx>
 
 #undef WIDOWTWIPS
 
diff --git a/sw/source/core/text/widorp.hxx b/sw/source/core/text/widorp.hxx
index 92f80f009b58..9c0e37fc2720 100644
--- a/sw/source/core/text/widorp.hxx
+++ b/sw/source/core/text/widorp.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SW_SOURCE_CORE_TEXT_WIDORP_HXX
 class SwTextFrame;
 
-#include "swtypes.hxx"
+#include <swtypes.hxx>
 #include "itrtxt.hxx"
 
 class SwTextFrameBreak
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index 3d0964cda92d..1a0a9a2c8828 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "swtypes.hxx"
+#include <swtypes.hxx>
 
-#include "SwGrammarMarkUp.hxx"
+#include <SwGrammarMarkUp.hxx>
 #include <osl/diagnose.h>
 
 SwWrongArea::SwWrongArea( const OUString& rType, WrongListType listType,
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 610dd9ce45b1..0bf58ac02fba 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -7,19 +7,19 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "frame.hxx"
-#include "frmfmt.hxx"
-#include "ftnfrm.hxx"
-#include "sectfrm.hxx"
-#include "tabfrm.hxx"
-#include "txtfrm.hxx"
-#include "hffrm.hxx"
-#include "rootfrm.hxx"
-#include "editsh.hxx"
+#include <frame.hxx>
+#include <frmfmt.hxx>
+#include <ftnfrm.hxx>
+#include <sectfrm.hxx>
+#include <tabfrm.hxx>
+#include <txtfrm.hxx>
+#include <hffrm.hxx>
+#include <rootfrm.hxx>
+#include <editsh.hxx>
 #include "porlin.hxx"
 #include "porlay.hxx"
 #include "portxt.hxx"
-#include "sortedobjs.hxx"
+#include <sortedobjs.hxx>
 #include <anchoredobject.hxx>
 #include <libxml/xmlwriter.h>
 #include <SwPortionHandler.hxx>
diff --git a/sw/source/core/tox/ToxLinkProcessor.cxx b/sw/source/core/tox/ToxLinkProcessor.cxx
index b30d8a41ebca..8dc671e7f0ee 100644
--- a/sw/source/core/tox/ToxLinkProcessor.cxx
+++ b/sw/source/core/tox/ToxLinkProcessor.cxx
@@ -8,10 +8,10 @@
  */
 
 #include <memory>
-#include "ToxLinkProcessor.hxx"
+#include <ToxLinkProcessor.hxx>
 
-#include "SwStyleNameMapper.hxx"
-#include "ndtxt.hxx"
+#include <SwStyleNameMapper.hxx>
+#include <ndtxt.hxx>
 #include <o3tl/make_unique.hxx>
 #include <strings.hrc>
 
diff --git a/sw/source/core/tox/ToxTabStopTokenHandler.cxx b/sw/source/core/tox/ToxTabStopTokenHandler.cxx
index f3f6a738dfa7..6de76cb4f2c7 100644
--- a/sw/source/core/tox/ToxTabStopTokenHandler.cxx
+++ b/sw/source/core/tox/ToxTabStopTokenHandler.cxx
@@ -7,20 +7,20 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "ToxTabStopTokenHandler.hxx"
-
-#include "editeng/tstpitem.hxx"
-#include "editeng/lrspitem.hxx"
-
-#include "cntfrm.hxx"
-#include "fmtfsize.hxx"
-#include "fmtpdsc.hxx"
-#include "frmfmt.hxx"
-#include "ndtxt.hxx"
-#include "pagedesc.hxx"
-#include "pagefrm.hxx"
-#include "swrect.hxx"
-#include "tox.hxx"
+#include <ToxTabStopTokenHandler.hxx>
+
+#include <editeng/tstpitem.hxx>
+#include <editeng/lrspitem.hxx>
+
+#include <cntfrm.hxx>
+#include <fmtfsize.hxx>
+#include <fmtpdsc.hxx>
+#include <frmfmt.hxx>
+#include <ndtxt.hxx>
+#include <pagedesc.hxx>
+#include <pagefrm.hxx>
+#include <swrect.hxx>
+#include <tox.hxx>
 
 namespace sw {
 
diff --git a/sw/source/core/tox/ToxTextGenerator.cxx b/sw/source/core/tox/ToxTextGenerator.cxx
index 2aa7f657d82d..61b664e70c09 100644
--- a/sw/source/core/tox/ToxTextGenerator.cxx
+++ b/sw/source/core/tox/ToxTextGenerator.cxx
@@ -19,27 +19,27 @@
 
 #include <ToxTextGenerator.hxx>
 
-#include "chpfld.hxx"
-#include "cntfrm.hxx"
-#include "fchrfmt.hxx"
-#include "doc.hxx"
+#include <chpfld.hxx>
+#include <cntfrm.hxx>
+#include <fchrfmt.hxx>
+#include <doc.hxx>
 #include <IDocumentLayoutAccess.hxx>
 #include <IDocumentStylePoolAccess.hxx>
-#include "fmtinfmt.hxx"
-#include "ndtxt.hxx"
-#include "pagedesc.hxx"
-#include "tox.hxx"
-#include "txmsrt.hxx"
-#include "fmtautofmt.hxx"
-#include "DocumentSettingManager.hxx"
-#include "SwStyleNameMapper.hxx"
-#include "swatrset.hxx"
-#include "ToxWhitespaceStripper.hxx"
-#include "ToxLinkProcessor.hxx"
-#include "ToxTabStopTokenHandler.hxx"
-#include "txatbase.hxx"
-
-#include "svl/itemiter.hxx"
+#include <fmtinfmt.hxx>
+#include <ndtxt.hxx>
+#include <pagedesc.hxx>
+#include <tox.hxx>
+#include <txmsrt.hxx>
+#include <fmtautofmt.hxx>
+#include <DocumentSettingManager.hxx>
+#include <SwStyleNameMapper.hxx>
+#include <swatrset.hxx>
+#include <ToxWhitespaceStripper.hxx>
+#include <ToxLinkProcessor.hxx>
+#include <ToxTabStopTokenHandler.hxx>
+#include <txatbase.hxx>
+
+#include <svl/itemiter.hxx>
 
 #include <cassert>
 #include <memory>
diff --git a/sw/source/core/tox/ToxWhitespaceStripper.cxx b/sw/source/core/tox/ToxWhitespaceStripper.cxx
index 9ea87c4e2ede..fb9315862d6e 100644
--- a/sw/source/core/tox/ToxWhitespaceStripper.cxx
+++ b/sw/source/core/tox/ToxWhitespaceStripper.cxx
@@ -7,10 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "ToxWhitespaceStripper.hxx"
+#include <ToxWhitespaceStripper.hxx>
 
-#include "rtl/ustrbuf.hxx"
-#include "sal/log.hxx"
+#include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 
 namespace sw {
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index 3aa9a961a784..c1ddb549defc 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -21,22 +21,22 @@
 
 #include <libxml/xmlwriter.h>
 
-#include "fldbas.hxx"
+#include <fldbas.hxx>
 #include <txtfld.hxx>
 #include <txtannotationfld.hxx>
 #include <docfld.hxx>
 #include <docufld.hxx>
 #include <doc.hxx>
 
-#include "pam.hxx"
-#include "reffld.hxx"
-#include "ddefld.hxx"
-#include "usrfld.hxx"
-#include "expfld.hxx"
-#include "swfont.hxx"
-#include "ndtxt.hxx"
-#include "calc.hxx"
-#include "hints.hxx"
+#include <pam.hxx>
+#include <reffld.hxx>
+#include <ddefld.hxx>
+#include <usrfld.hxx>
+#include <expfld.hxx>
+#include <swfont.hxx>
+#include <ndtxt.hxx>
+#include <calc.hxx>
+#include <hints.hxx>
 #include <IDocumentFieldsAccess.hxx>
 #include <fieldhint.hxx>
 
diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx
index 26d34a1740d5..45cc6bdf48d1 100644
--- a/sw/source/core/txtnode/atrflyin.cxx
+++ b/sw/source/core/txtnode/atrflyin.cxx
@@ -17,21 +17,21 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
-#include "cntfrm.hxx"
-#include "doc.hxx"
+#include <hintids.hxx>
+#include <cntfrm.hxx>
+#include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
 #include <IDocumentLayoutAccess.hxx>
-#include "pam.hxx"
-#include "flyfrm.hxx"
-#include "ndtxt.hxx"
-#include "frmfmt.hxx"
+#include <pam.hxx>
+#include <flyfrm.hxx>
+#include <ndtxt.hxx>
+#include <frmfmt.hxx>
 #include <fmtflcnt.hxx>
 #include <txtflcnt.hxx>
 #include <fmtanchr.hxx>
-#include "swfont.hxx"
-#include "txtfrm.hxx"
-#include "flyfrms.hxx"
+#include <swfont.hxx>
+#include <txtfrm.hxx>
+#include <flyfrms.hxx>
 #include <objectformatter.hxx>
 #include <calbck.hxx>
 
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index e96dfd0f9166..577ad6584321 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -20,7 +20,7 @@
 #include <libxml/xmlwriter.h>
 #include <hintids.hxx>
 #include <poolfmt.hxx>
-#include "unomid.h"
+#include <unomid.h>
 
 #include <basic/sbxvar.hxx>
 #include <o3tl/any.hxx>
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index decd7a709ea9..4bba114b9522 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -40,7 +40,7 @@
 #include <IDocumentSettingAccess.hxx>
 #include <swfont.hxx>
 #include <wrong.hxx>
-#include "dbg_lay.hxx"
+#include <dbg_lay.hxx>
 #include <txtfrm.hxx>
 #include <pagefrm.hxx>
 #include <pagedesc.hxx>
diff --git a/sw/source/core/txtnode/ndhints.cxx b/sw/source/core/txtnode/ndhints.cxx
index 58ac2803f247..0099a379c118 100644
--- a/sw/source/core/txtnode/ndhints.cxx
+++ b/sw/source/core/txtnode/ndhints.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "txatbase.hxx"
-#include "ndhints.hxx"
+#include <txatbase.hxx>
+#include <ndhints.hxx>
 #include <txtatr.hxx>
 
 #ifdef DBG_UTIL
diff --git a/sw/source/core/txtnode/swfntcch.cxx b/sw/source/core/txtnode/swfntcch.cxx
index f8788d241d2b..8f199191ae4d 100644
--- a/sw/source/core/txtnode/swfntcch.cxx
+++ b/sw/source/core/txtnode/swfntcch.cxx
@@ -21,10 +21,10 @@
 
 #include <shellio.hxx>
 #include <viewsh.hxx>
-#include "swfntcch.hxx"
-#include "fmtcol.hxx"
-#include "fntcache.hxx"
-#include "swfont.hxx"
+#include <swfntcch.hxx>
+#include <fmtcol.hxx>
+#include <fntcache.hxx>
+#include <swfont.hxx>
 
 // from atrstck.cxx
 extern const sal_uInt8 StackPos[];
diff --git a/sw/source/core/undo/unbkmk.cxx b/sw/source/core/undo/unbkmk.cxx
index a503bc69c8a7..fc465aad21b2 100644
--- a/sw/source/core/undo/unbkmk.cxx
+++ b/sw/source/core/undo/unbkmk.cxx
@@ -20,16 +20,16 @@
 #include <UndoBookmark.hxx>
 
 #include <strings.hrc>
-#include "doc.hxx"
-#include "docary.hxx"
-#include "swundo.hxx"
-#include "pam.hxx"
+#include <doc.hxx>
+#include <docary.hxx>
+#include <swundo.hxx>
+#include <pam.hxx>
 
 #include <UndoCore.hxx>
-#include "IMark.hxx"
-#include "rolbck.hxx"
+#include <IMark.hxx>
+#include <rolbck.hxx>
 
-#include "SwRewriter.hxx"
+#include <SwRewriter.hxx>
 
 SwUndoBookmark::SwUndoBookmark( SwUndoId nUndoId,
             const ::sw::mark::IMark& rBkmk )
diff --git a/sw/source/core/undo/unfmco.cxx b/sw/source/core/undo/unfmco.cxx
index 019e7b7694c2..7fe9b244146b 100644
--- a/sw/source/core/undo/unfmco.cxx
+++ b/sw/source/core/undo/unfmco.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "doc.hxx"
-#include "swundo.hxx"
-#include "pam.hxx"
-#include "ndtxt.hxx"
+#include <doc.hxx>
+#include <swundo.hxx>
+#include <pam.hxx>
+#include <ndtxt.hxx>
 #include <UndoCore.hxx>
-#include "rolbck.hxx"
-#include "docary.hxx"
+#include <rolbck.hxx>
+#include <docary.hxx>
 
 SwUndoFormatColl::SwUndoFormatColl( const SwPaM& rRange,
                               SwFormatColl* pColl,
diff --git a/sw/source/core/undo/unoutl.cxx b/sw/source/core/undo/unoutl.cxx
index 8b9429c159ec..eecb7b85e5ae 100644
--- a/sw/source/core/undo/unoutl.cxx
+++ b/sw/source/core/undo/unoutl.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "doc.hxx"
-#include "swundo.hxx"
-#include "pam.hxx"
-#include "ndtxt.hxx"
+#include <doc.hxx>
+#include <swundo.hxx>
+#include <pam.hxx>
+#include <ndtxt.hxx>
 
 #include <UndoCore.hxx>
 
diff --git a/sw/source/core/undo/unspnd.cxx b/sw/source/core/undo/unspnd.cxx
index ee5de4acce69..0b388491ef86 100644
--- a/sw/source/core/undo/unspnd.cxx
+++ b/sw/source/core/undo/unspnd.cxx
@@ -18,19 +18,19 @@
  */
 
 #include <UndoSplitMove.hxx>
-#include "doc.hxx"
+#include <doc.hxx>
 #include <IDocumentRedlineAccess.hxx>
-#include "pam.hxx"
-#include "swtable.hxx"
-#include "ndtxt.hxx"
-#include "swundo.hxx"
+#include <pam.hxx>
+#include <swtable.hxx>
+#include <ndtxt.hxx>
+#include <swundo.hxx>
 #include <editeng/formatbreakitem.hxx>
 #include <fmtpdsc.hxx>
 #include <frmfmt.hxx>
 #include <UndoCore.hxx>
-#include "rolbck.hxx"
-#include "redline.hxx"
-#include "docary.hxx"
+#include <rolbck.hxx>
+#include <redline.hxx>
+#include <docary.hxx>
 #include <IShellCursorSupplier.hxx>
 
 // SPLITNODE
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 352f31ea1dbd..f0bbd01cccad 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -176,7 +176,7 @@ public:
 };
 
 #if OSL_DEBUG_LEVEL > 0
-#include "shellio.hxx"
+#include <shellio.hxx>
 void CheckTable( const SwTable& );
 #define CHECKTABLE(t) CheckTable( t );
 #else
diff --git a/sw/source/core/unocore/TextCursorHelper.cxx b/sw/source/core/unocore/TextCursorHelper.cxx
index 973757ac328c..df4a49001ba4 100644
--- a/sw/source/core/unocore/TextCursorHelper.cxx
+++ b/sw/source/core/unocore/TextCursorHelper.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "TextCursorHelper.hxx"
-#include "unobaseclass.hxx"
+#include <TextCursorHelper.hxx>
+#include <unobaseclass.hxx>
 #include <comphelper/servicehelper.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 3e2fc6d489dc..cc4dcfa4720e 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -68,7 +68,7 @@
 #include <unobookmark.hxx>
 #include <unorefmark.hxx>
 #include <unometa.hxx>
-#include "docsh.hxx"
+#include <docsh.hxx>
 #include <calbck.hxx>
 #include <com/sun/star/document/XCodeNameQuery.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx
index 58f43bb886e9..111db21ae357 100644
--- a/sw/source/core/unocore/unoevent.cxx
+++ b/sw/source/core/unocore/unoevent.cxx
@@ -18,14 +18,14 @@
  */
 
 // HINTIDs must be on top; it is required for the macitem.hxx header
-#include "hintids.hxx"
-#include "unoevent.hxx"
-#include "unoframe.hxx"
-#include "unostyle.hxx"
-#include "swevent.hxx"
-#include "docstyle.hxx"
+#include <hintids.hxx>
+#include <unoevent.hxx>
+#include <unoframe.hxx>
+#include <unostyle.hxx>
+#include <swevent.hxx>
+#include <docstyle.hxx>
 #include <svx/svxids.hrc>
-#include "fmtinfmt.hxx"
+#include <fmtinfmt.hxx>
 #include <svl/macitem.hxx>
 #include <rtl/ustrbuf.hxx>
 
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index 0b1adbb59fcb..887b76d807f1 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -28,7 +28,7 @@
 #include <comphelper/servicehelper.hxx>
 
 #include <pagedesc.hxx>
-#include "poolfmt.hxx"
+#include <poolfmt.hxx>
 #include <redline.hxx>
 #include <section.hxx>
 #include <unoprnms.hxx>
diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx
index e68a2eca865e..d75670160bf0 100644
--- a/sw/source/core/unocore/unoredlines.cxx
+++ b/sw/source/core/unocore/unoredlines.cxx
@@ -27,7 +27,7 @@
 #include <unoredline.hxx>
 #include <unomid.h>
 #include <pagedesc.hxx>
-#include "poolfmt.hxx"
+#include <poolfmt.hxx>
 #include <doc.hxx>
 #include <IDocumentStylePoolAccess.hxx>
 #include <docary.hxx>
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index ffc325c1cfec..1abc80765813 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -22,8 +22,8 @@
 #include <swtypes.hxx>
 #include <cmdid.h>
 #include <hintids.hxx>
-#include "strings.hrc"
-#include "poolfmt.hxx"
+#include <strings.hrc>
+#include <poolfmt.hxx>
 #include <fmtcol.hxx>
 #include <unomap.hxx>
 #include <unostyle.hxx>
diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx
index 4c6d37a6ba6d..24dc547087a4 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "unosrch.hxx"
+#include <unosrch.hxx>
 #include <doc.hxx>
 #include <hints.hxx>
 #include <unomap.hxx>
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 67ad889ead63..b97b166b34a2 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -56,7 +56,7 @@
 #include <fmtpdsc.hxx>
 #include <strings.hrc>
 #include <poolfmt.hxx>
-#include "unoevent.hxx"
+#include <unoevent.hxx>
 #include <fmtruby.hxx>
 #include <SwStyleNameMapper.hxx>
 #include <sfx2/printer.hxx>
@@ -88,7 +88,7 @@
 #include <swunohelper.hxx>
 #include <svx/xbtmpit.hxx>
 
-#include "ccoll.hxx"
+#include <ccoll.hxx>
 
 #include <cassert>
 #include <memory>
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index 969f2e033e23..2fca28b7a5fb 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -27,17 +27,17 @@
 
 #include <svx/svdoutl.hxx>
 
-#include "drawdoc.hxx"
-#include "fesh.hxx"
-#include "pagefrm.hxx"
-#include "rootfrm.hxx"
-#include "viewimp.hxx"
-#include "dflyobj.hxx"
-#include "viewopt.hxx"
-#include "printdata.hxx"
-#include "dcontact.hxx"
-#include "dview.hxx"
-#include "flyfrm.hxx"
+#include <drawdoc.hxx>
+#include <fesh.hxx>
+#include <pagefrm.hxx>
+#include <rootfrm.hxx>
+#include <viewimp.hxx>
+#include <dflyobj.hxx>
+#include <viewopt.hxx>
+#include <printdata.hxx>
+#include <dcontact.hxx>
+#include <dview.hxx>
+#include <flyfrm.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/canvastools.hxx>
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index 7a79eabc2600..5faefb389bc4 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -17,17 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "crsrsh.hxx"
-#include "rootfrm.hxx"
-#include "pagefrm.hxx"
-#include "viewimp.hxx"
-#include "viewopt.hxx"
-#include "flyfrm.hxx"
-#include "frmfmt.hxx"
-#include "layact.hxx"
-#include "swregion.hxx"
-#include "dflyobj.hxx"
-#include "dview.hxx"
+#include <crsrsh.hxx>
+#include <rootfrm.hxx>
+#include <pagefrm.hxx>
+#include <viewimp.hxx>
+#include <viewopt.hxx>
+#include <flyfrm.hxx>
+#include <frmfmt.hxx>
+#include <layact.hxx>
+#include <swregion.hxx>
+#include <dflyobj.hxx>
+#include <dview.hxx>
 #include <swmodule.hxx>
 #include <svx/svdpage.hxx>
 #include <accmap.hxx>
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 951f8e04da57..a2f256d67234 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -66,7 +66,7 @@
 #include <svtools/accessibilityoptions.hxx>
 #include <accessibilityoptions.hxx>
 #include <strings.hrc>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 #include <pagepreviewlayout.hxx>
 #include <sortedobjs.hxx>
 #include <anchoredobject.hxx>
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 21eb43e9149f..f8f889ce98b2 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -68,7 +68,7 @@
 #include <viscrs.hxx>
 #include <fmtpdsc.hxx>
 #include <globals.hrc>
-#include "PostItMgr.hxx"
+#include <PostItMgr.hxx>
 #include "vprint.hxx"
 
 using namespace ::com::sun::star;
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index db3ab306ec1f..69fe4a3a99d8 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <comphelper/string.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
@@ -75,15 +75,15 @@
 #include <txtftn.hxx>
 #include <fmtftn.hxx>
 // FOOTNOTES
-#include "doc.hxx"
+#include <doc.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <IDocumentLayoutAccess.hxx>
-#include "swerror.h"
-#include "charatr.hxx"
-#include "paratr.hxx"
-#include "frmatr.hxx"
-#include "poolfmt.hxx"
-#include "fltini.hxx"
+#include <swerror.h>
+#include <charatr.hxx>
+#include <paratr.hxx>
+#include <frmatr.hxx>
+#include <poolfmt.hxx>
+#include <fltini.hxx>
 #include "css1kywd.hxx"
 #include "wrthtml.hxx"
 #include "htmlnum.hxx"
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index ec875b33f9c4..ee63d5a3ddec 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -67,7 +67,7 @@
 #include <poolfmt.hxx>
 #include <pagedesc.hxx>
 #include <swtable.hxx>
-#include "fldbas.hxx"
+#include <fldbas.hxx>
 #include <breakit.hxx>
 #include "htmlatr.hxx"
 #include "htmlnum.hxx"
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 535f6fb0f71e..17dfb5138a8f 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -37,10 +37,10 @@
 #include <fmtornt.hxx>
 #include <fmtfld.hxx>
 
-#include "doc.hxx"
+#include <doc.hxx>
 #include <IDocumentFieldsAccess.hxx>
-#include "docsh.hxx"
-#include "docufld.hxx"
+#include <docsh.hxx>
+#include <docufld.hxx>
 #include "wrthtml.hxx"
 #include "swhtml.hxx"
 
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index d93afe561d58..01fb4ab01943 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <svl/itemiter.hxx>
 #include <svl/whiter.hxx>
 #include <svl/urihelper.hxx>
@@ -42,19 +42,19 @@
 #include <fmtornt.hxx>
 #include <fmtsrnd.hxx>
 #include <fmtfsize.hxx>
-#include "frmatr.hxx"
+#include <frmatr.hxx>
 #include <charfmt.hxx>
 #include <docary.hxx>
 #include <svx/svxids.hrc>
 
-#include "doc.hxx"
+#include <doc.hxx>
 #include <IDocumentStylePoolAccess.hxx>
-#include "pam.hxx"
-#include "ndtxt.hxx"
-#include "poolfmt.hxx"
-#include "docsh.hxx"
-#include "paratr.hxx"
-#include "pagedesc.hxx"
+#include <pam.hxx>
+#include <ndtxt.hxx>
+#include <poolfmt.hxx>
+#include <docsh.hxx>
+#include <paratr.hxx>
+#include <pagedesc.hxx>
 #include "css1kywd.hxx"
 #include "swcss1.hxx"
 #include "htmlnum.hxx"
diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx
index 28444317f1a5..76144ff6cb5c 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <o3tl/make_unique.hxx>
 #include <svl/itemiter.hxx>
 #include <editeng/lrspitem.hxx>
@@ -27,11 +27,11 @@
 #include <svtools/htmltokn.h>
 #include <editeng/boxitem.hxx>
 
-#include "doc.hxx"
-#include "pam.hxx"
-#include "ndtxt.hxx"
-#include "shellio.hxx"
-#include "paratr.hxx"
+#include <doc.hxx>
+#include <pam.hxx>
+#include <ndtxt.hxx>
+#include <shellio.hxx>
+#include <paratr.hxx>
 #include "htmlnum.hxx"
 #include "css1kywd.hxx"
 #include "swcss1.hxx"
diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx
index d773d0173646..171e991222af 100644
--- a/sw/source/filter/html/htmldrawreader.cxx
+++ b/sw/source/filter/html/htmldrawreader.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <svx/svdmodel.hxx>
@@ -38,16 +38,16 @@
 #include <svtools/htmlkywd.hxx>
 #include <svx/svdpool.hxx>
 
-#include "charatr.hxx"
-#include "drawdoc.hxx"
+#include <charatr.hxx>
+#include <drawdoc.hxx>
 #include <frmfmt.hxx>
 #include <fmtanchr.hxx>
 #include <fmtsrnd.hxx>
-#include "ndtxt.hxx"
-#include "doc.hxx"
+#include <ndtxt.hxx>
+#include <doc.hxx>
 #include <IDocumentDrawModelAccess.hxx>
-#include "dcontact.hxx"
-#include "poolfmt.hxx"
+#include <dcontact.hxx>
+#include <poolfmt.hxx>
 #include "swcss1.hxx"
 #include "swhtml.hxx"
 #include <shellio.hxx>
diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx
index 2af0c66397fd..e6667fddc1d6 100644
--- a/sw/source/filter/html/htmldrawwriter.cxx
+++ b/sw/source/filter/html/htmldrawwriter.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <svx/svdmodel.hxx>
@@ -41,14 +41,14 @@
 #include <rtl/strbuf.hxx>
 
 #include <IDocumentDrawModelAccess.hxx>
-#include "charatr.hxx"
+#include <charatr.hxx>
 #include <frmfmt.hxx>
 #include <fmtanchr.hxx>
 #include <fmtsrnd.hxx>
-#include "ndtxt.hxx"
-#include "doc.hxx"
-#include "dcontact.hxx"
-#include "poolfmt.hxx"
+#include <ndtxt.hxx>
+#include <doc.hxx>
+#include <dcontact.hxx>
+#include <poolfmt.hxx>
 
 #include "wrthtml.hxx"
 
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index 073b10a48c80..622d81792af9 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -20,7 +20,7 @@
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 
-#include "docsh.hxx"
+#include <docsh.hxx>
 #include <IDocumentFieldsAccess.hxx>
 #include <svtools/htmltokn.h>
 #include <svl/zformat.hxx>
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index 77cb69eed62f..10839a86f691 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -27,13 +27,13 @@
 #include <breakit.hxx>
 #include <ndtxt.hxx>
 #include <txtfld.hxx>
-#include "fldbas.hxx"
-#include "docufld.hxx"
-#include "flddat.hxx"
+#include <fldbas.hxx>
+#include <docufld.hxx>
+#include <flddat.hxx>
 #include "htmlfld.hxx"
 #include "wrthtml.hxx"
 #include <rtl/strbuf.hxx>
-#include <css1atr.hxx>
+#include "css1atr.hxx"
 
 using namespace nsSwDocInfoSubType;
 
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 6b390344e866..7d45e0a2a843 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -30,8 +30,8 @@
 #include <flypos.hxx>
 #include <docary.hxx>
 
-#include "doc.hxx"
-#include "frmfmt.hxx"
+#include <doc.hxx>
+#include <frmfmt.hxx>
 
 using namespace css;
 
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index 46d48f52bd14..90a3ebecd7cc 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/text/RelOrientation.hpp>
 #include <comphelper/string.hxx>
 #include <svx/svxids.hrc>
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <tools/fract.hxx>
 #include <svl/urihelper.hxx>
 #include <vcl/svapp.hxx>
@@ -50,17 +50,17 @@
 #include <fmtsrnd.hxx>
 #include <fmtinfmt.hxx>
 #include <txtinet.hxx>
-#include "frmatr.hxx"
+#include <frmatr.hxx>
 #include <grfatr.hxx>
 #include <flypos.hxx>
 #include <docary.hxx>
 #include <ndgrf.hxx>
 
-#include "doc.hxx"
-#include "ndtxt.hxx"
-#include "pam.hxx"
-#include "swerror.h"
-#include "frmfmt.hxx"
+#include <doc.hxx>
+#include <ndtxt.hxx>
+#include <pam.hxx>
+#include <swerror.h>
+#include <frmfmt.hxx>
 #include "wrthtml.hxx"
 #include "css1kywd.hxx"
 #include "htmlatr.hxx"
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index bca98350cb87..0857e0ca48e3 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -72,7 +72,7 @@
 #include <viewsh.hxx>
 #include <unodraw.hxx>
 #include <unotextrange.hxx>
-#include "dcontact.hxx"
+#include <dcontact.hxx>
 
 #include "swcss1.hxx"
 #include "swhtml.hxx"
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index a963de30fb44..cf12af48e9c9 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -53,16 +53,16 @@
 #include <fmtanchr.hxx>
 #include <docary.hxx>
 #include <viewsh.hxx>
-#include "pam.hxx"
-#include "doc.hxx"
+#include <pam.hxx>
+#include <doc.hxx>
 #include <IDocumentLayoutAccess.hxx>
 #include <IDocumentDrawModelAccess.hxx>
-#include "ndtxt.hxx"
-#include "flypos.hxx"
+#include <ndtxt.hxx>
+#include <flypos.hxx>
 #include "wrthtml.hxx"
 #include "htmlfly.hxx"
 #include "htmlform.hxx"
-#include "frmfmt.hxx"
+#include <frmfmt.hxx>
 #include <rtl/strbuf.hxx>
 #include <memory>
 
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 2f6a0b26cf8b..e4749b248b12 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <memory>
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <comphelper/string.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
@@ -49,8 +49,8 @@
 #include <fmtcntnt.hxx>
 #include <fmtanchr.hxx>
 #include <fmtfsize.hxx>
-#include "frmatr.hxx"
-#include "charatr.hxx"
+#include <frmatr.hxx>
+#include <charatr.hxx>
 #include <frmfmt.hxx>
 #include <charfmt.hxx>
 #include <docary.hxx>
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 2eb47a1374dd..6c7373df40d9 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -19,7 +19,7 @@
 
 #include <config_features.h>
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <rtl/strbuf.hxx>
 #include <svl/urihelper.hxx>
 #include <vcl/svapp.hxx>
@@ -43,17 +43,17 @@
 #include <svl/ownlist.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <unotools/streamwrap.hxx>
-#include "pam.hxx"
-#include "doc.hxx"
-#include "ndtxt.hxx"
-#include "swerror.h"
-#include "ndole.hxx"
-#include "swtable.hxx"
+#include <pam.hxx>
+#include <doc.hxx>
+#include <ndtxt.hxx>
+#include <swerror.h>
+#include <ndole.hxx>
+#include <swtable.hxx>
 #include "swhtml.hxx"
 #include "wrthtml.hxx"
 #include "htmlfly.hxx"
 #include "swcss1.hxx"
-#include "unoframe.hxx"
+#include <unoframe.hxx>
 #include <com/sun/star/embed/XClassifiedObject.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 158b555c518c..f6a55669e4c6 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -29,7 +29,7 @@
 #include <svtools/htmlkywd.hxx>
 #include <sfx2/linkmgr.hxx>
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <fmtornt.hxx>
 #include <fmthdft.hxx>
 #include <fmtcntnt.hxx>
@@ -39,16 +39,16 @@
 #include <fmtpdsc.hxx>
 #include <fmtsrnd.hxx>
 #include <fmtflcnt.hxx>
-#include "frmatr.hxx"
-#include "doc.hxx"
-#include "pam.hxx"
-#include "ndtxt.hxx"
-#include "shellio.hxx"
-#include "section.hxx"
-#include "poolfmt.hxx"
-#include "pagedesc.hxx"
-#include "swtable.hxx"
-#include "viewsh.hxx"
+#include <frmatr.hxx>
+#include <doc.hxx>
+#include <pam.hxx>
+#include <ndtxt.hxx>
+#include <shellio.hxx>
+#include <section.hxx>
+#include <poolfmt.hxx>
+#include <pagedesc.hxx>
+#include <swtable.hxx>
+#include <viewsh.hxx>
 #include "swcss1.hxx"
 #include "swhtml.hxx"
 
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 367e9a8cdb41..0f4e97213912 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <memory>
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <editeng/boxitem.hxx>
@@ -42,17 +42,17 @@
 #include <fmtcntnt.hxx>
 #include <fmtanchr.hxx>
 #include <fmtlsplt.hxx>
-#include "frmatr.hxx"
-#include "pam.hxx"
-#include "doc.hxx"
+#include <frmatr.hxx>
+#include <pam.hxx>
+#include <doc.hxx>
 #include <IDocumentLayoutAccess.hxx>
-#include "ndtxt.hxx"
-#include "shellio.hxx"
-#include "poolfmt.hxx"
-#include "swtable.hxx"
-#include "cellatr.hxx"
-#include "htmltbl.hxx"
-#include "swtblfmt.hxx"
+#include <ndtxt.hxx>
+#include <shellio.hxx>
+#include <poolfmt.hxx>
+#include <swtable.hxx>
+#include <cellatr.hxx>
+#include <htmltbl.hxx>
+#include <swtblfmt.hxx>
 #include "htmlnum.hxx"
 #include "swhtml.hxx"
 #include "swcss1.hxx"
diff --git a/sw/source/filter/html/swcss1.hxx b/sw/source/filter/html/swcss1.hxx
index 6dbc9610ba03..09c571be23cf 100644
--- a/sw/source/filter/html/swcss1.hxx
+++ b/sw/source/filter/html/swcss1.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_FILTER_HTML_SWCSS1_HXX
 #define INCLUDED_SW_SOURCE_FILTER_HTML_SWCSS1_HXX
 
-#include "poolfmt.hxx"
+#include <poolfmt.hxx>
 
 #include "svxcss1.hxx"
 
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 6f3658868ff4..01d4acd01afc 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/form/XFormComponent.hpp>
 
-#include "calbck.hxx"
+#include <calbck.hxx>
 
 #include <memory>
 #include <vector>
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index e42b877eee10..6ded81694981 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -32,8 +32,8 @@
 #include <o3tl/typed_flags_set.hxx>
 #include <rtl/ref.hxx>
 
-#include "shellio.hxx"
-#include "wrt_fn.hxx"
+#include <shellio.hxx>
+#include <wrt_fn.hxx>
 #include "htmlfly.hxx"
 
 // some forward declarations
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index 9a9d484c1925..2fad70d89c64 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -32,7 +32,7 @@
 #include <rtl/textenc.h>
 #include <tools/gen.hxx>
 #include <filter/msfilter/util.hxx>
-#include <fltshell.hxx>
+#include "fltshell.hxx"
 #include <redline.hxx>
 #include <shellio.hxx>
 #include <svl/zforlist.hxx>
diff --git a/sw/source/filter/inc/wrt_fn.hxx b/sw/source/filter/inc/wrt_fn.hxx
index 599530013571..4d20fe2b39a6 100644
--- a/sw/source/filter/inc/wrt_fn.hxx
+++ b/sw/source/filter/inc/wrt_fn.hxx
@@ -18,7 +18,7 @@
  */
 #ifndef INCLUDED_SW_SOURCE_FILTER_INC_WRT_FN_HXX
 #define INCLUDED_SW_SOURCE_FILTER_INC_WRT_FN_HXX
-#include "hintids.hxx"
+#include <hintids.hxx>
 
 // some forward declarations
 class SwNode;
diff --git a/sw/source/filter/writer/wrt_fn.cxx b/sw/source/filter/writer/wrt_fn.cxx
index 6d06165daa77..9f06edcceeb1 100644
--- a/sw/source/filter/writer/wrt_fn.cxx
+++ b/sw/source/filter/writer/wrt_fn.cxx
@@ -23,10 +23,10 @@
 // tdf#94088 SdrAllFillAttributesHelper needed
 #include <svx/unobrushitemhelper.hxx>
 
-#include "shellio.hxx"
-#include "wrt_fn.hxx"
-#include "node.hxx"
-#include "format.hxx"
+#include <shellio.hxx>
+#include <wrt_fn.hxx>
+#include <node.hxx>
+#include <format.hxx>
 
 Writer& Out( const SwAttrFnTab pTab, const SfxPoolItem& rHt, Writer & rWrt )
 {
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx
index 082ac7f5c730..00f55e075424 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -21,13 +21,13 @@
 #include <set>
 #include <stdio.h>
 #include "WW8TableInfo.hxx"
-#include "fmtfsize.hxx"
+#include <fmtfsize.hxx>
 #include "attributeoutputbase.hxx"
-#include "swtable.hxx"
-#include "frmfmt.hxx"
-#include "pam.hxx"
-#include "ndtxt.hxx"
-#include "dbgoutsw.hxx"
+#include <swtable.hxx>
+#include <frmfmt.hxx>
+#include <pam.hxx>
+#include <ndtxt.hxx>
+#include <dbgoutsw.hxx>
 
 namespace ww8
 {
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 0461408b0a67..54d2819c2445 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -25,19 +25,19 @@
 #include "docxfootnotes.hxx"
 #include "writerwordglue.hxx"
 #include "ww8par.hxx"
-#include "fmtcntnt.hxx"
-#include "fmtftn.hxx"
-#include "fchrfmt.hxx"
-#include "tgrditem.hxx"
-#include "fmtruby.hxx"
-#include "fmtanchr.hxx"
-#include "breakit.hxx"
-#include "redline.hxx"
-#include "unocoll.hxx"
-#include "unoframe.hxx"
-#include "unodraw.hxx"
-#include "textboxhelper.hxx"
-#include "rdfhelper.hxx"
+#include <fmtcntnt.hxx>
+#include <fmtftn.hxx>
+#include <fchrfmt.hxx>
+#include <tgrditem.hxx>
+#include <fmtruby.hxx>
+#include <fmtanchr.hxx>
+#include <breakit.hxx>
+#include <redline.hxx>
+#include <unocoll.hxx>
+#include <unoframe.hxx>
+#include <unodraw.hxx>
+#include <textboxhelper.hxx>
+#include <rdfhelper.hxx>
 #include "wrtww8.hxx"
 
 #include <comphelper/random.hxx>
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 2515210fcfb5..8822d523dec3 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -24,7 +24,7 @@
 
 #include "attributeoutputbase.hxx"
 #include "fields.hxx"
-#include "IMark.hxx"
+#include <IMark.hxx>
 #include "docxexport.hxx"
 
 #include <sax/fshelper.hxx>
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 48e004bb7102..ad19d27d5d89 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -23,7 +23,7 @@
 #include "rtfsdrexport.hxx"
 #include "writerwordglue.hxx"
 #include "ww8par.hxx"
-#include "fmtcntnt.hxx"
+#include <fmtcntnt.hxx>
 #include <rtl/tencinfo.h>
 #include <svtools/rtfkeywd.hxx>
 #include <editeng/fontitem.hxx>
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 3d2d2655b0ac..e9fa1a83af68 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -88,14 +88,14 @@
 #include "WW8FFData.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/form/XFormComponent.hpp>
-#include "docsh.hxx"
-#include "IDocumentStylePoolAccess.hxx"
+#include <docsh.hxx>
+#include <IDocumentStylePoolAccess.hxx>
 #include <oox/ole/olehelper.hxx>
 #include <fstream>
 #include <unotools/streamwrap.hxx>
 #include <fmtinfmt.hxx>
 #include <fmturl.hxx>
-#include "sfx2/sfxsids.hrc"
+#include <sfx2/sfxsids.hrc>
 #include <svl/urihelper.hxx>
 #include <unotools/saveopt.hxx>
 #include <o3tl/enumrange.hxx>
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 6781ac5576f5..dfa54a781ce5 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -101,7 +101,7 @@
 #include <xmloff/odffields.hxx>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
-#include "dbgoutsw.hxx"
+#include <dbgoutsw.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/frame.hxx>
@@ -115,10 +115,10 @@
 #include "WW8Sttbf.hxx"
 #include <editeng/charrotateitem.hxx>
 #include "WW8FibData.hxx"
-#include "numrule.hxx"
-#include "fmtclds.hxx"
-#include "rdfhelper.hxx"
-#include "fmtclbl.hxx"
+#include <numrule.hxx>
+#include <fmtclds.hxx>
+#include <rdfhelper.hxx>
+#include <fmtclbl.hxx>
 
 using namespace css;
 using namespace sw::util;
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index a835bfca6099..6d7f0069731d 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -33,7 +33,7 @@
 #include "fields.hxx"
 #include "types.hxx"
 #include "writerhelper.hxx"
-#include "msfilter.hxx"
+#include <msfilter.hxx>
 #include <expfld.hxx>
 #include "WW8TableInfo.hxx"
 
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 3f2ea6287d87..5cf65d2ba839 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -62,9 +62,9 @@
 #include "escher.hxx"
 //Added for i120568
 #include "ww8attributeoutput.hxx"
-#include "fmturl.hxx"
+#include <fmturl.hxx>
 
-#include "docsh.hxx"
+#include <docsh.hxx>
 #include <cstdio>
 #include <o3tl/enumrange.hxx>
 
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 2eff10a2af13..0dcf361b8445 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -99,7 +99,7 @@
 
 #include "writerwordglue.hxx"
 
-#include "ndgrf.hxx"
+#include <ndgrf.hxx>
 #include <editeng/editids.hrc>
 #include <txtflcnt.hxx>
 #include <fmtflcnt.hxx>
@@ -127,7 +127,7 @@
 #endif
 
 #include <svx/hlnkitem.hxx>
-#include "swdll.hxx"
+#include <swdll.hxx>
 #include "WW8Sttbf.hxx"
 #include "WW8FibData.hxx"
 #include <unordered_set>
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 8f0bbb674b85..35d0bdf6d120 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -26,12 +26,12 @@
 #include <unotextcursor.hxx>
 #include <unotextrange.hxx>
 #include <unocrsr.hxx>
-#include "doc.hxx"
+#include <doc.hxx>
 #include <IDocumentContentOperations.hxx>
 #include <IDocumentStylePoolAccess.hxx>
 #include <tools/datetime.hxx>
-#include "poolfmt.hxx"
-#include "unoredline.hxx"
+#include <poolfmt.hxx>
+#include <unoredline.hxx>
 #include <o3tl/any.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
index 01fe6153e625..2cd397d040fc 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/util/DateTime.hpp>
-#include "redline.hxx"
+#include <redline.hxx>
 
 #include <map>
 
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index 415751bdee1f..6bb997059b65 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <editeng/memberids.h>
 
 #include <xmloff/nmspmap.hxx>
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index 2657e61e1e90..a1149ca11a32 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -35,8 +35,8 @@
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlprhdl.hxx>
 #include <editeng/memberids.h>
-#include "hintids.hxx"
-#include "unomid.h"
+#include <hintids.hxx>
+#include <unomid.h>
 #include <svx/unomid.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/ulspitem.hxx>
@@ -45,14 +45,14 @@
 #include <editeng/formatbreakitem.hxx>
 #include <editeng/keepitem.hxx>
 #include <editeng/brushitem.hxx>
-#include "fmtpdsc.hxx"
-#include "fmtornt.hxx"
-#include "fmtfsize.hxx"
+#include <fmtpdsc.hxx>
+#include <fmtornt.hxx>
+#include <fmtfsize.hxx>
 
-#include "fmtlsplt.hxx"
+#include <fmtlsplt.hxx>
 #include "xmlithlp.hxx"
 
-#include "fmtrowsplt.hxx"
+#include <fmtrowsplt.hxx>
 
 using ::editeng::SvxBorderLine;
 using namespace ::com::sun::star;
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 7c129e072d52..c918f9899eb0 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -28,12 +28,12 @@
 #include <charfmt.hxx>
 #include <paratr.hxx>
 #include <doc.hxx>
-#include "docary.hxx"
+#include <docary.hxx>
 #include <IDocumentStylePoolAccess.hxx>
-#include "unostyle.hxx"
-#include "unoprnms.hxx"
-#include "fmtpdsc.hxx"
-#include "pagedesc.hxx"
+#include <unostyle.hxx>
+#include <unoprnms.hxx>
+#include <fmtpdsc.hxx>
+#include <pagedesc.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/i18nmap.hxx>
 #include <xmloff/xmltkmap.hxx>
@@ -48,7 +48,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include "xmlimp.hxx"
 #include "xmltbli.hxx"
-#include "cellatr.hxx"
+#include <cellatr.hxx>
 #include <SwStyleNameMapper.hxx>
 #include <xmloff/attrlist.hxx>
 #include <unotxdoc.hxx>
diff --git a/sw/source/filter/xml/xmlfonte.cxx b/sw/source/filter/xml/xmlfonte.cxx
index 9edf2f7252a3..7738d51ba50e 100644
--- a/sw/source/filter/xml/xmlfonte.cxx
+++ b/sw/source/filter/xml/xmlfonte.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <xmloff/XMLFontAutoStylePool.hxx>
 #include <editeng/fontitem.hxx>
 #include <unotext.hxx>
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 949585384d31..6a2a9c0b9a63 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -48,14 +48,14 @@
 #include <TextCursorHelper.hxx>
 #include <unotext.hxx>
 #include <unotextrange.hxx>
-#include "unocrsr.hxx"
+#include <unocrsr.hxx>
 #include <poolfmt.hxx>
 #include <ndtxt.hxx>
 #include <editsh.hxx>
 #include <strings.hrc>
 #include "xmlimp.hxx"
 #include "xmltexti.hxx"
-#include "swdll.hxx"
+#include <swdll.hxx>
 #include <xmloff/DocumentSettingsContext.hxx>
 #include <docsh.hxx>
 #include <editeng/unolingu.hxx>
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index c501056a02cd..0a837a0bfcda 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -31,8 +31,8 @@
 #include <editeng/xmlcnitm.hxx>
 #include <editeng/memberids.h>
 
-#include "hintids.hxx"
-#include "unomid.h"
+#include <hintids.hxx>
+#include <unomid.h>
 #include <svx/unomid.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/ulspitem.hxx>
@@ -41,11 +41,11 @@
 #include <editeng/formatbreakitem.hxx>
 #include <editeng/keepitem.hxx>
 #include <editeng/brushitem.hxx>
-#include "fmtpdsc.hxx"
-#include "fmtornt.hxx"
-#include "fmtfsize.hxx"
+#include <fmtpdsc.hxx>
+#include <fmtornt.hxx>
+#include <fmtfsize.hxx>
 
-#include "fmtlsplt.hxx"
+#include <fmtlsplt.hxx>
 #include <xmloff/prhdlfac.hxx>
 #include <xmloff/xmltypes.hxx>
 #include <xmloff/xmlprhdl.hxx>
diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx
index e377ed34b44b..60eaedd1f562 100644
--- a/sw/source/filter/xml/xmliteme.cxx
+++ b/sw/source/filter/xml/xmliteme.cxx
@@ -33,11 +33,11 @@
 #include <tools/fldunit.hxx>
 #include <swmodule.hxx>
 #include <doc.hxx>
-#include "fmtornt.hxx"
+#include <fmtornt.hxx>
 #include <unomid.h>
-#include "frmfmt.hxx"
-#include "fmtfsize.hxx"
-#include "swrect.hxx"
+#include <frmfmt.hxx>
+#include <fmtfsize.hxx>
+#include <swrect.hxx>
 #include "xmlexp.hxx"
 #include <editeng/memberids.h>
 #include <comphelper/processfactory.hxx>
diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx
index 0315e204dced..a4d23808bbaf 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "xmlithlp.hxx"
-#include "hintids.hxx"
-#include "unomid.h"
+#include <hintids.hxx>
+#include <unomid.h>
 #include <sax/tools/converter.hxx>
 #include <svx/unomid.hxx>
 #include <editeng/lrspitem.hxx>
@@ -29,11 +29,11 @@
 #include <editeng/formatbreakitem.hxx>
 #include <editeng/keepitem.hxx>
 #include <editeng/brushitem.hxx>
-#include "fmtpdsc.hxx"
-#include "fmtornt.hxx"
-#include "fmtfsize.hxx"
+#include <fmtpdsc.hxx>
+#include <fmtornt.hxx>
+#include <fmtfsize.hxx>
 
-#include "fmtlsplt.hxx"
+#include <fmtlsplt.hxx>
 #include <xmloff/xmluconv.hxx>
 
 using ::editeng::SvxBorderLine;
diff --git a/sw/source/filter/xml/xmlithlp.hxx b/sw/source/filter/xml/xmlithlp.hxx
index e2728bc2a04c..c3c0512f16b8 100644
--- a/sw/source/filter/xml/xmlithlp.hxx
+++ b/sw/source/filter/xml/xmlithlp.hxx
@@ -22,7 +22,7 @@
 
 #include <sal/types.h>
 #include <xmloff/xmlement.hxx>
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <editeng/brushitem.hxx>
 
 namespace editeng { class SvxBorderLine; }
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index 9618e8c8219e..0d75cfc9b606 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -25,8 +25,8 @@
 #include <editeng/langitem.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "docstat.hxx"
-#include "docsh.hxx"
+#include <docstat.hxx>
+#include <docsh.hxx>
 #include <doc.hxx>
 #include <IDocumentStatistics.hxx>
 #include "xmlimp.hxx"
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index cb944abc9153..18ed1cd2ef73 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -33,20 +33,20 @@
 #include <fmtrowsplt.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <list>
-#include "swtable.hxx"
-#include "doc.hxx"
-#include "pam.hxx"
-#include "frmfmt.hxx"
-#include "wrtswtbl.hxx"
-#include "fmtfsize.hxx"
-#include "fmtornt.hxx"
-#include "cellatr.hxx"
-#include "ddefld.hxx"
-#include "swddetbl.hxx"
+#include <swtable.hxx>
+#include <doc.hxx>
+#include <pam.hxx>
+#include <frmfmt.hxx>
+#include <wrtswtbl.hxx>
+#include <fmtfsize.hxx>
+#include <fmtornt.hxx>
+#include <cellatr.hxx>
+#include <ddefld.hxx>
+#include <swddetbl.hxx>
 #include <ndole.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <sfx2/linkmgr.hxx>
-#include "unotbl.hxx"
+#include <unotbl.hxx>
 #include "xmltexte.hxx"
 #include "xmlexp.hxx"
 #include <o3tl/any.hxx>
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index a9280da72b13..b33d19fa8a55 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/text/XTextTable.hpp>
@@ -35,28 +35,28 @@
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/i18nmap.hxx>
 #include <editeng/protitem.hxx>
-#include "poolfmt.hxx"
-#include "fmtfsize.hxx"
-#include "fmtornt.hxx"
-#include "fmtfordr.hxx"
-#include "doc.hxx"
+#include <poolfmt.hxx>
+#include <fmtfsize.hxx>
+#include <fmtornt.hxx>
+#include <fmtfordr.hxx>
+#include <doc.hxx>
 #include <IDocumentFieldsAccess.hxx>
 #include <IDocumentLayoutAccess.hxx>
 #include <IDocumentStylePoolAccess.hxx>
-#include "swtable.hxx"
-#include "swtblfmt.hxx"
-#include "pam.hxx"
-#include "unotbl.hxx"
-#include "unotextrange.hxx"
-#include "unocrsr.hxx"
-#include "cellatr.hxx"
-#include "swddetbl.hxx"
-#include "ddefld.hxx"
+#include <swtable.hxx>
+#include <swtblfmt.hxx>
+#include <pam.hxx>
+#include <unotbl.hxx>
+#include <unotextrange.hxx>
+#include <unocrsr.hxx>
+#include <cellatr.hxx>
+#include <swddetbl.hxx>
+#include <ddefld.hxx>
 #include <sfx2/linkmgr.hxx>
 #include "xmlimp.hxx"
 #include "xmltbli.hxx"
 #include <vcl/svapp.hxx>
-#include "ndtxt.hxx"
+#include <ndtxt.hxx>
 
 #include <vector>
 #include <memory>
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 0776fc9fb8aa..a7ea624175c4 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -34,13 +34,13 @@
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/txtprmap.hxx>
 #include <xmloff/i18nmap.hxx>
-#include "unocrsr.hxx"
-#include "TextCursorHelper.hxx"
-#include "unoframe.hxx"
-#include "doc.hxx"
+#include <unocrsr.hxx>
+#include <TextCursorHelper.hxx>
+#include <unoframe.hxx>
+#include <doc.hxx>
 #include <IDocumentDrawModelAccess.hxx>
 #include <IDocumentContentOperations.hxx>
-#include "unocoll.hxx"
+#include <unocoll.hxx>
 #include <fmtfsize.hxx>
 #include <fmtanchr.hxx>
 #include <fmtcntnt.hxx>
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 096a6d637f8a..7298f3e4e643 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -19,13 +19,13 @@
 
 #include <hintids.hxx>
 
-#include "cmdid.h"
+#include <cmdid.h>
 #include <docsh.hxx>
-#include "swmodule.hxx"
-#include "view.hxx"
-#include "wrtsh.hxx"
-#include "globals.hrc"
-#include "strings.hrc"
+#include <swmodule.hxx>
+#include <view.hxx>
+#include <wrtsh.hxx>
+#include <globals.hrc>
+#include <strings.hrc>
 
 #include <vcl/metric.hxx>
 #include <vcl/settings.hxx>
@@ -44,12 +44,12 @@
 #include <com/sun/star/i18n/BreakIterator.hpp>
 #include <comphelper/processfactory.hxx>
 
-#include "charatr.hxx"
-#include "viewopt.hxx"
-#include "drpcps.hxx"
-#include "paratr.hxx"
-#include "uitool.hxx"
-#include "charfmt.hxx"
+#include <charatr.hxx>
+#include <viewopt.hxx>
+#include <drpcps.hxx>
+#include <paratr.hxx>
+#include <uitool.hxx>
+#include <charfmt.hxx>
 
 using namespace css;
 using namespace css::uno;
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 2c8b4b24776c..7138654d1291 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "cmdid.h"
-#include "swtypes.hxx"
-#include "hintids.hxx"
-#include "globals.hrc"
-#include "strings.hrc"
-#include "helpids.h"
+#include <cmdid.h>
+#include <swtypes.hxx>
+#include <hintids.hxx>
+#include <globals.hrc>
+#include <strings.hrc>
+#include <helpids.h>
 #include <sfx2/objsh.hxx>
 #include <sfx2/htmlmode.hxx>
 #include <svx/svxids.hrc>
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 18158982aebf..01491a1f6d96 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -17,25 +17,25 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <sfx2/htmlmode.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <svl/style.hxx>
 #include <svtools/htmlcfg.hxx>
 #include <svl/cjkoptions.hxx>
-#include "docsh.hxx"
-#include "wrtsh.hxx"
-#include "frmatr.hxx"
-#include "view.hxx"
-#include "globals.hrc"
-#include "swuipardlg.hxx"
-#include "pagedesc.hxx"
-#include "paratr.hxx"
-#include "drpcps.hxx"
-#include "uitool.hxx"
-#include "viewopt.hxx"
+#include <docsh.hxx>
+#include <wrtsh.hxx>
+#include <frmatr.hxx>
+#include <view.hxx>
+#include <globals.hrc>
+#include <swuipardlg.hxx>
+#include <pagedesc.hxx>
+#include <paratr.hxx>
+#include <drpcps.hxx>
+#include <uitool.hxx>
+#include <viewopt.hxx>
 #include <numpara.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 #include <svx/svxids.hrc>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index 875e251426e4..7a9c9345c9be 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -18,26 +18,26 @@
  */
 
 #include <memory>
-#include "cmdid.h"
-#include "swmodule.hxx"
-#include "view.hxx"
-#include "wrtsh.hxx"
-#include "globals.hrc"
-#include "helpids.h"
+#include <cmdid.h>
+#include <swmodule.hxx>
+#include <view.hxx>
+#include <wrtsh.hxx>
+#include <globals.hrc>
+#include <helpids.h>
 
 #include <sfx2/styfitem.hxx>
 
-#include "uitool.hxx"
-#include "ccoll.hxx"
-#include "fmtcol.hxx"
-#include "hintids.hxx"
-#include "docsh.hxx"
-#include "docstyle.hxx"
-#include "hints.hxx"
+#include <uitool.hxx>
+#include <ccoll.hxx>
+#include <fmtcol.hxx>
+#include <hintids.hxx>
+#include <docsh.hxx>
+#include <docstyle.hxx>
+#include <hints.hxx>
 
 #include <vcl/svapp.hxx>
 
-#include "swuiccoll.hxx"
+#include <swuiccoll.hxx>
 
 const sal_uInt16 SwCondCollPage::m_aPageRg[] = {
     FN_COND_COLL, FN_COND_COLL,
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 95b0654c953d..6775525988eb 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -34,7 +34,7 @@
 #include <vcl/msgbox.hxx>
 #include <globals.hrc>
 #include <dbui.hrc>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 #include <helpids.h>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index f91b948440b2..c204998f35a0 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -17,16 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "optcomp.hxx"
+#include <optcomp.hxx>
 
-#include "docsh.hxx"
-#include "swmodule.hxx"
-#include "swtypes.hxx"
-#include "uiitems.hxx"
-#include "view.hxx"
-#include "wrtsh.hxx"
+#include <docsh.hxx>
+#include <swmodule.hxx>
+#include <swtypes.hxx>
+#include <uiitems.hxx>
+#include <view.hxx>
+#include <wrtsh.hxx>
 
-#include "globals.hrc"
+#include <globals.hrc>
 #include <unotools/configmgr.hxx>
 #include <vcl/layout.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 0440b5c8b889..1824dc7ab7ac 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -23,19 +23,19 @@
 #include <helpids.h>
 #include <uiitems.hxx>
 #include <modcfg.hxx>
-#include "swmodule.hxx"
-#include "usrpref.hxx"
-#include "wrtsh.hxx"
-#include "linkenum.hxx"
+#include <swmodule.hxx>
+#include <usrpref.hxx>
+#include <wrtsh.hxx>
+#include <linkenum.hxx>
 #include <uitool.hxx>
 #include <view.hxx>
 
-#include "globals.hrc"
-#include "strings.hrc"
-#include "optload.hrc"
-#include "cmdid.h"
+#include <globals.hrc>
+#include <strings.hrc>
+#include <optload.hrc>
+#include <cmdid.h>
 
-#include "optload.hxx"
+#include <optload.hxx>
 #include <svx/dlgutil.hxx>
 #include <sfx2/htmlmode.hxx>
 #include <fldmgr.hxx>
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 0eafad8b80a3..922901abd31d 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -73,7 +73,7 @@
 #include <vcl/builderfactory.hxx>
 #include <vcl/svapp.hxx>
 
-#include "optload.hxx"
+#include <optload.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 2f80c7db6823..aa6b09aa4304 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -18,12 +18,12 @@
  */
 
 #include <swtypes.hxx>
-#include <addresslistdialog.hxx>
-#include <selectdbtabledialog.hxx>
-#include <createaddresslistdialog.hxx>
+#include "addresslistdialog.hxx"
+#include "selectdbtabledialog.hxx"
+#include "createaddresslistdialog.hxx"
 #include <mailmergewizard.hxx>
 #include <mmconfigitem.hxx>
-#include <mmaddressblockpage.hxx>
+#include "mmaddressblockpage.hxx"
 #include <dbmgr.hxx>
 #include <dbconfig.hxx>
 #include <unotools/tempfile.hxx>
diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx
index 2269fb353acf..6769c8353151 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/sw/source/ui/dbui/addresslistdialog.hxx
@@ -24,7 +24,7 @@
 #include <svtools/svtabbx.hxx>
 #include <svtools/headbar.hxx>
 #include <swdbdata.hxx>
-#include "sharedconnection.hxx"
+#include <sharedconnection.hxx>
 
 namespace com{namespace sun{namespace star{
     namespace container{
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index f3bf43e9959c..9960f0d978b2 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -22,8 +22,8 @@
 #include <cstddef>
 
 #include <swtypes.hxx>
-#include <createaddresslistdialog.hxx>
-#include <customizeaddresslistdialog.hxx>
+#include "createaddresslistdialog.hxx"
+#include "customizeaddresslistdialog.hxx"
 #include <mmconfigitem.hxx>
 #include <comphelper/string.hxx>
 #include <vcl/scrbar.hxx>
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
index 613860b020e7..dc2053011115 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <swtypes.hxx>
-#include <customizeaddresslistdialog.hxx>
-#include <createaddresslistdialog.hxx>
+#include "customizeaddresslistdialog.hxx"
+#include "createaddresslistdialog.hxx"
 #include <vcl/scrbar.hxx>
 #include <vcl/msgbox.hxx>
 #include <dbui.hrc>
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index aa655be4af6c..f184357d514c 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbinsdlg.hxx"
+#include <dbinsdlg.hxx>
 
 #include <float.h>
 
@@ -83,9 +83,9 @@
 #include <helpids.h>
 #include <SwStyleNameMapper.hxx>
 #include <comphelper/uno3.hxx>
-#include "tabsh.hxx"
-#include "swabstdlg.hxx"
-#include "strings.hrc"
+#include <tabsh.hxx>
+#include <swabstdlg.hxx>
+#include <strings.hrc>
 #include <unomid.h>
 #include <IDocumentMarkAccess.hxx>
 
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
index 2c0d1fb45710..347515038357 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <swtypes.hxx>
-#include <dbtablepreviewdialog.hxx>
+#include "dbtablepreviewdialog.hxx"
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/frame/Frame.hpp>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index 15eda7fa94be..f72c95f5a1be 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -18,11 +18,11 @@
  */
 
 #include <mailmergewizard.hxx>
-#include <mmdocselectpage.hxx>
-#include <mmoutputtypepage.hxx>
-#include <mmaddressblockpage.hxx>
-#include <mmgreetingspage.hxx>
-#include <mmlayoutpage.hxx>
+#include "mmdocselectpage.hxx"
+#include "mmoutputtypepage.hxx"
+#include "mmaddressblockpage.hxx"
+#include "mmgreetingspage.hxx"
+#include "mmlayoutpage.hxx"
 #include <mmconfigitem.hxx>
 #include <swabstdlg.hxx>
 #include <dbui.hrc>
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index d966be4d7981..df119fba54fc 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <mmaddressblockpage.hxx>
+#include "mmaddressblockpage.hxx"
 #include <mailmergewizard.hxx>
 #include <swtypes.hxx>
-#include <addresslistdialog.hxx>
+#include "addresslistdialog.hxx"
 #include <vcl/layout.hxx>
 #include <vcl/txtattr.hxx>
 #include <vcl/xtextedt.hxx>
@@ -37,7 +37,7 @@
 #include <globals.hrc>
 #include <strings.hrc>
 #include <dbui.hrc>
-#include "mmaddressblockpage.hrc"
+#include <mmaddressblockpage.hrc>
 #include <helpids.h>
 
 using namespace svt;
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index 7d0a2cdfc93f..5f1c0ffc1314 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -26,7 +26,7 @@
 #include <vcl/msgbox.hxx>
 #include <view.hxx>
 #include <docsh.hxx>
-#include <mmdocselectpage.hxx>
+#include "mmdocselectpage.hxx"
 #include <mailmergewizard.hxx>
 #include <shellio.hxx>
 #include <swabstdlg.hxx>
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index 5f11cd94177c..f5cbf1cea436 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <mmgreetingspage.hxx>
+#include "mmgreetingspage.hxx"
 #include <mailmergewizard.hxx>
 #include <mmconfigitem.hxx>
-#include <mmaddressblockpage.hxx>
+#include "mmaddressblockpage.hxx"
 #include <swtypes.hxx>
 #include <vcl/msgbox.hxx>
 #include <dbui.hrc>
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index 7f2085d08f3b..cf3e34411655 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <swtypes.hxx>
-#include <mmlayoutpage.hxx>
+#include "mmlayoutpage.hxx"
 #include <mailmergewizard.hxx>
 #include <mmconfigitem.hxx>
 #include <mailmergehelper.hxx>
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 06424c743aca..7697ea523cb4 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <mmoutputtypepage.hxx>
+#include "mmoutputtypepage.hxx"
 #include <mailmergewizard.hxx>
 #include <mmconfigitem.hxx>
 #include <vcl/msgbox.hxx>
 #include <dbui.hrc>
 #include <strings.hrc>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 #include <swtypes.hxx>
 
 #include <rtl/ref.hxx>
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index e24e73121b86..4ed83ff6dd95 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -21,7 +21,7 @@
 #include <mailmergewizard.hxx>
 #include <mmconfigitem.hxx>
 #include <mailconfigpage.hxx>
-#include <mmgreetingspage.hxx>
+#include "mmgreetingspage.hxx"
 #include <swmessdialog.hxx>
 #include <cmdid.h>
 #include <swtypes.hxx>
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index 385761245168..235411a90ed9 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <swtypes.hxx>
-#include <selectdbtabledialog.hxx>
-#include <dbtablepreviewdialog.hxx>
+#include "selectdbtabledialog.hxx"
+#include "dbtablepreviewdialog.hxx"
 #include <svtools/simptabl.hxx>
 #include <svtools/treelistentry.hxx>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
diff --git a/sw/source/ui/dialog/abstract.cxx b/sw/source/ui/dialog/abstract.cxx
index 841faeb1c555..07818448f870 100644
--- a/sw/source/ui/dialog/abstract.cxx
+++ b/sw/source/ui/dialog/abstract.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "swtypes.hxx"
-#include "hintids.hxx"
+#include <swtypes.hxx>
+#include <hintids.hxx>
 
-#include "abstract.hxx"
+#include <abstract.hxx>
 
 SwInsertAbstractDlg::SwInsertAbstractDlg(vcl::Window* pParent)
     : SfxModalDialog(pParent, "AbstractDialog",
diff --git a/sw/source/ui/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx
index 13455f323c24..d2d43389cafd 100644
--- a/sw/source/ui/dialog/addrdlg.cxx
+++ b/sw/source/ui/dialog/addrdlg.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "addrdlg.hxx"
+#include <addrdlg.hxx>
 #include <svx/svxdlg.hxx>
 #include <sfx2/pageids.hxx>
 
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index f9bcdfc648fa..735752aacf78 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -17,22 +17,22 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 
 #include <sfx2/htmlmode.hxx>
 #include <svx/svxids.hrc>
 #include <sfx2/app.hxx>
 #include <vcl/msgbox.hxx>
 
-#include "swtypes.hxx"
-#include "wrtsh.hxx"
-#include "viewopt.hxx"
-#include "macassgn.hxx"
-#include "swevent.hxx"
-#include "docsh.hxx"
-#include "globals.hrc"
-#include "strings.hrc"
-#include "view.hxx"
+#include <swtypes.hxx>
+#include <wrtsh.hxx>
+#include <viewopt.hxx>
+#include <macassgn.hxx>
+#include <swevent.hxx>
+#include <docsh.hxx>
+#include <globals.hrc>
+#include <strings.hrc>
+#include <view.hxx>
 #include <sfx2/viewfrm.hxx>
 
 #include <svx/svxdlg.hxx>
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 12f2ce433673..5747c999a01d 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -20,42 +20,42 @@
 #include "swdlgfact.hxx"
 #include <svl/style.hxx>
 #include <svx/svxids.hrc>
-#include "dbui.hrc"
-#include "globals.hrc"
-#include "strings.hrc"
+#include <dbui.hrc>
+#include <globals.hrc>
+#include <strings.hrc>
 
 #include <wordcountdialog.hxx>
-#include "abstract.hxx"
-#include "addrdlg.hxx"
-#include "ascfldlg.hxx"
-#include "bookmark.hxx"
-#include "break.hxx"
-#include "changedb.hxx"
-#include "chrdlg.hxx"
-#include "convert.hxx"
-#include "cption.hxx"
-#include "dbinsdlg.hxx"
-#include "docfnote.hxx"
-#include "docstdlg.hxx"
-#include "DropDownFieldDialog.hxx"
-#include "envlop.hxx"
-#include "label.hxx"
-#include "drpcps.hxx"
-#include "swuipardlg.hxx"
-#include "pattern.hxx"
-#include "rowht.hxx"
-#include "selglos.hxx"
-#include "splittbl.hxx"
-#include "srtdlg.hxx"
-#include "tautofmt.hxx"
-#include "tblnumfm.hxx"
-#include "wrap.hxx"
-#include "colwd.hxx"
-#include "tabledlg.hxx"
-#include "fldtdlg.hxx"
-#include "fldedt.hxx"
-#include "swrenamexnameddlg.hxx"
-#include "swmodalredlineacceptdlg.hxx"
+#include <abstract.hxx>
+#include <addrdlg.hxx>
+#include <ascfldlg.hxx>
+#include <bookmark.hxx>
+#include <break.hxx>
+#include <changedb.hxx>
+#include <chrdlg.hxx>
+#include <convert.hxx>
+#include <cption.hxx>
+#include <dbinsdlg.hxx>
+#include <docfnote.hxx>
+#include <docstdlg.hxx>
+#include <DropDownFieldDialog.hxx>
+#include <envlop.hxx>
+#include <label.hxx>
+#include <drpcps.hxx>
+#include <swuipardlg.hxx>
+#include <pattern.hxx>
+#include <rowht.hxx>
+#include <selglos.hxx>
+#include <splittbl.hxx>
+#include <srtdlg.hxx>
+#include <tautofmt.hxx>
+#include <tblnumfm.hxx>
+#include <wrap.hxx>
+#include <colwd.hxx>
+#include <tabledlg.hxx>
+#include <fldtdlg.hxx>
+#include <fldedt.hxx>
+#include <swrenamexnameddlg.hxx>
+#include <swmodalredlineacceptdlg.hxx>
 #include <frmdlg.hxx>
 #include <tmpdlg.hxx>
 #include <glossary.hxx>
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 0f94db107ab8..489faaaf7354 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UI_DIALOG_SWDLGFACT_HXX
 #define INCLUDED_SW_SOURCE_UI_DIALOG_SWDLGFACT_HXX
 
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
 
 class SwInsertAbstractDlg;
 class SwAsciiFilterDlg;
@@ -37,7 +37,7 @@ class SwModalRedlineAcceptDlg;
 class SwTOXMark;
 class SwSplitTableDlg;
 
-#include "itabenum.hxx"
+#include <itabenum.hxx>
 
 #include <boost/optional.hpp>
 
diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx
index a54748b0c9ef..4e73ff5fe4c2 100644
--- a/sw/source/ui/dialog/swuiexp.cxx
+++ b/sw/source/ui/dialog/swuiexp.cxx
@@ -19,30 +19,30 @@
 
 #include "swdlgfact.hxx"
 
-#include "abstract.hxx"
-#include "ascfldlg.hxx"
-#include "break.hxx"
-#include "convert.hxx"
-#include "dbinsdlg.hxx"
-#include "DropDownFieldDialog.hxx"
-#include "fldtdlg.hxx"
-#include "glossary.hxx"
-#include "inpdlg.hxx"
-#include "insfnote.hxx"
-#include "instable.hxx"
-#include "javaedit.hxx"
-#include "label.hxx"
-#include "mailmrge.hxx"
-#include "mailmergewizard.hxx"
-#include "regionsw.hxx"
-#include "selglos.hxx"
-#include "splittbl.hxx"
-#include "tautofmt.hxx"
-#include "swmodalredlineacceptdlg.hxx"
-#include "swrenamexnameddlg.hxx"
-#include "swuiidxmrk.hxx"
-#include "swuicnttab.hxx"
-#include "wordcountdialog.hxx"
+#include <abstract.hxx>
+#include <ascfldlg.hxx>
+#include <break.hxx>
+#include <convert.hxx>
+#include <dbinsdlg.hxx>
+#include <DropDownFieldDialog.hxx>
+#include <fldtdlg.hxx>
+#include <glossary.hxx>
+#include <inpdlg.hxx>
+#include <insfnote.hxx>
+#include <instable.hxx>
+#include <javaedit.hxx>
+#include <label.hxx>
+#include <mailmrge.hxx>
+#include <mailmergewizard.hxx>
+#include <regionsw.hxx>
+#include <selglos.hxx>
+#include <splittbl.hxx>
+#include <tautofmt.hxx>
+#include <swmodalredlineacceptdlg.hxx>
+#include <swrenamexnameddlg.hxx>
+#include <swuiidxmrk.hxx>
+#include <swuicnttab.hxx>
+#include <wordcountdialog.hxx>
 #include <swuiexp.hxx>
 
 namespace swui
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 5607fb67b061..7dd6c49a4495 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -56,7 +56,7 @@
 #include <cmdid.h>
 #include <strings.hrc>
 #include <globals.hrc>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 #include <sfx2/bindings.hxx>
 #include <sfx2/htmlmode.hxx>
 #include <svx/dlgutil.hxx>
diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx
index dd70fbdada59..9478adcc3b1b 100644
--- a/sw/source/ui/dochdl/selglos.cxx
+++ b/sw/source/ui/dochdl/selglos.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "swtypes.hxx"
+#include <swtypes.hxx>
 
-#include "selglos.hxx"
+#include <selglos.hxx>
 
-#include "strings.hrc"
+#include <strings.hrc>
 #include <vcl/layout.hxx>
 
 SwSelGlossaryDlg::SwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName)
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index a9b1f2923447..a53832123b84 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -33,9 +33,9 @@
 #include <view.hxx>
 #include <basesh.hxx>
 #include <drpcps.hxx>
-#include <envfmt.hxx>
+#include "envfmt.hxx"
 #include <fmtcol.hxx>
-#include "swuipardlg.hxx"
+#include <swuipardlg.hxx>
 #include <chrdlgmodes.hxx>
 #include <pattern.hxx>
 #include <poolfmt.hxx>
@@ -46,7 +46,7 @@
 
 #include <memory>
 
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
 #include <swuiexp.hxx>
 
 namespace {
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index 6bf55a6a4ccb..294b2ac2eb1a 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -23,7 +23,7 @@
 #include <vcl/menubtn.hxx>
 #include <vcl/group.hxx>
 
-#include "envlop.hxx"
+#include <envlop.hxx>
 
 class SwTextFormatColl;
 
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index f9513274b29b..29eea5e17ec5 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbmgr.hxx"
+#include <dbmgr.hxx>
 #include <sfx2/app.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/msgbox.hxx>
@@ -26,15 +26,15 @@
 #include <swwait.hxx>
 #include <viewopt.hxx>
 
-#include "wrtsh.hxx"
-#include "cmdid.h"
-#include "helpids.h"
+#include <wrtsh.hxx>
+#include <cmdid.h>
+#include <helpids.h>
 #include "envfmt.hxx"
-#include "envlop.hxx"
+#include <envlop.hxx>
 #include "envprt.hxx"
-#include "fmtcol.hxx"
-#include "poolfmt.hxx"
-#include "view.hxx"
+#include <fmtcol.hxx>
+#include <poolfmt.hxx>
+#include <view.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index fcaa98116faf..b1a5819fd662 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -20,13 +20,13 @@
 #include <vcl/print.hxx>
 #include <svtools/prnsetup.hxx>
 
-#include "swtypes.hxx"
-#include "cmdid.h"
+#include <swtypes.hxx>
+#include <cmdid.h>
 #include "envprt.hxx"
-#include "envlop.hxx"
-#include "uitool.hxx"
+#include <envlop.hxx>
+#include <uitool.hxx>
 
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 SwEnvPrtPage::SwEnvPrtPage(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "EnvPrinterPage",
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index 523a51cbce4b..84cad1803179 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -27,8 +27,8 @@
 #include <vcl/group.hxx>
 #include <vcl/button.hxx>
 
-#include "envimg.hxx"
-#include "envlop.hxx"
+#include <envimg.hxx>
+#include <envlop.hxx>
 
 class SwEnvDlg;
 
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index d45ad2364dbb..ae77841935d5 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -26,12 +26,12 @@
 #include <swtypes.hxx>
 #include <wrtsh.hxx>
 #include <initui.hxx>
-#include "labimp.hxx"
-#include <labfmt.hxx>
-#include <labprt.hxx>
+#include <labimp.hxx>
+#include "labfmt.hxx"
+#include "labprt.hxx"
 #include <unotools.hxx>
 #include <dbmgr.hxx>
-#include "uitool.hxx"
+#include <uitool.hxx>
 #include <cmdid.h>
 #include <helpids.h>
 #include <globals.hrc>
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index 5732997e6eca..6f7a79623bb9 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -24,7 +24,7 @@
 #include <comphelper/processfactory.hxx>
 #include <svtools/treelistentry.hxx>
 #include <swtypes.hxx>
-#include <labfmt.hxx>
+#include "labfmt.hxx"
 #include <unotools.hxx>
 #include <unoatxt.hxx>
 #include <unomid.h>
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 6474089ffd3b..5a4bde52985e 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -24,15 +24,15 @@
 
 #include <viewopt.hxx>
 
-#include "swtypes.hxx"
-#include "cmdid.h"
-#include "label.hxx"
-#include "labimp.hxx"
-#include "labimg.hxx"
+#include <swtypes.hxx>
+#include <cmdid.h>
+#include <label.hxx>
+#include <labimp.hxx>
+#include <labimg.hxx>
 #include "labfmt.hxx"
-#include "uitool.hxx"
+#include <uitool.hxx>
 
-#include "strings.hrc"
+#include <strings.hrc>
 #include <unomid.h>
 
 using namespace utl;
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index a54321d61640..a1044c7c85a3 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SW_SOURCE_UI_ENVELP_LABFMT_HXX
 
 #include "swuilabimp.hxx"
-#include "labimg.hxx"
+#include <labimg.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/idle.hxx>
 class SwLabFormatPage;
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index 3fa3742d2894..4bc9f9d88a03 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -22,7 +22,7 @@
 #include <vcl/print.hxx>
 #include <wrtsh.hxx>
 #include <label.hxx>
-#include <labprt.hxx>
+#include "labprt.hxx"
 #include <labimg.hxx>
 
 #include <cmdid.h>
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 2c720b2c8bdf..23819efb8211 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UI_ENVELP_SWUILABIMP_HXX
 #define INCLUDED_SW_SOURCE_UI_ENVELP_SWUILABIMP_HXX
 
-#include "labimp.hxx"
+#include <labimp.hxx>
 #include <com/sun/star/text/XAutoTextContainer2.hpp>
 #include <vcl/layout.hxx>
 
diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx
index 693b06b5bde6..242056c4f06c 100644
--- a/sw/source/ui/fldui/FldRefTreeListBox.cxx
+++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <FldRefTreeListBox.hxx>
+#include "FldRefTreeListBox.hxx"
 
 #include <helpids.h>
 #include <vcl/builderfactory.hxx>
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index acbe41e0fc5e..790b1a187330 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -40,7 +40,7 @@
 
 #include <globals.hrc>
 #include <strings.hrc>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 #include <unomid.h>
 
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 0c74aaa581df..0d2f547c7b72 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -25,7 +25,7 @@
 #include <fldtdlg.hxx>
 #include <numrule.hxx>
 
-#include <flddb.hxx>
+#include "flddb.hxx"
 #include <dbconfig.hxx>
 #include <dbmgr.hxx>
 
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index 8600ac19fb82..6dd7fdd738ac 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -24,9 +24,9 @@
 #include <vcl/button.hxx>
 #include <vcl/group.hxx>
 
-#include "condedit.hxx"
-#include "dbtree.hxx"
-#include "numfmtlb.hxx"
+#include <condedit.hxx>
+#include <dbtree.hxx>
+#include <numfmtlb.hxx>
 
 #include "fldpage.hxx"
 
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 60dae5d14698..592a46c5ec89 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -32,7 +32,7 @@
 #include <docufld.hxx>
 #include <wrtsh.hxx>
 
-#include <flddinf.hxx>
+#include "flddinf.hxx"
 #include <swmodule.hxx>
 #include <view.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index 01ac1d5c0df2..64ea9701b317 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -27,7 +27,7 @@
 #include <vcl/group.hxx>
 #include <svtools/treelistbox.hxx>
 
-#include "numfmtlb.hxx"
+#include <numfmtlb.hxx>
 #include "fldpage.hxx"
 
 namespace com{namespace sun{ namespace star{ namespace beans{
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 09e57675ee5c..5709f6058389 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -23,7 +23,7 @@
 #include <globals.hrc>
 #include <strings.hrc>
 #include <chpfld.hxx>
-#include <flddok.hxx>
+#include "flddok.hxx"
 #include <swmodule.hxx>
 #include <view.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx
index ab5cde0c4de8..ea5b31b5adc1 100644
--- a/sw/source/ui/fldui/flddok.hxx
+++ b/sw/source/ui/fldui/flddok.hxx
@@ -27,7 +27,7 @@
 #include <vcl/edit.hxx>
 #include <vcl/field.hxx>
 
-#include "numfmtlb.hxx"
+#include <numfmtlb.hxx>
 #include "fldpage.hxx"
 
 class SwFieldDokPage : public SwFieldPage
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 88476c473816..4f6a57868136 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -28,18 +28,18 @@
 #include <view.hxx>
 #include <dbfld.hxx>
 #include <wrtsh.hxx>
-#include <flddb.hxx>
-#include <flddinf.hxx>
-#include <fldvar.hxx>
-#include <flddok.hxx>
-#include <fldfunc.hxx>
-#include <fldref.hxx>
+#include "flddb.hxx"
+#include "flddinf.hxx"
+#include "fldvar.hxx"
+#include "flddok.hxx"
+#include "fldfunc.hxx"
+#include "fldref.hxx"
 #include <fldedt.hxx>
 
 #include <cmdid.h>
 #include <helpids.h>
 #include <globals.hrc>
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 8b0396cad75b..32fb4862f929 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -29,7 +29,7 @@
 #include <view.hxx>
 #include <wrtsh.hxx>
 #include <swmodule.hxx>
-#include <fldfunc.hxx>
+#include "fldfunc.hxx"
 #include <flddropdown.hxx>
 
 #define USER_DATA_VERSION_1 "1"
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index a86417931ab1..4315467ec25e 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -26,7 +26,7 @@
 #include <vcl/group.hxx>
 #include <vcl/edit.hxx>
 
-#include "condedit.hxx"
+#include <condedit.hxx>
 #include "fldpage.hxx"
 #include <actctrl.hxx>
 
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index fc9c2882ffac..c490b5e72c05 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -32,7 +32,7 @@
 #include <wrtsh.hxx>
 #include <expfld.hxx>
 #include <fldtdlg.hxx>
-#include <fldpage.hxx>
+#include "fldpage.hxx"
 #include <docufld.hxx>
 #include <cmdid.h>
 #include <globals.hrc>
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index e510898deae2..a427e8be7f91 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "swtypes.hxx"
+#include <swtypes.hxx>
 #include <view.hxx>
 #include <IMark.hxx>
 #include <expfld.hxx>
 #include <swmodule.hxx>
-#include <fldref.hxx>
+#include "fldref.hxx"
 #include <reffld.hxx>
 #include <wrtsh.hxx>
 
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index bcc122e8c17f..486ab9f4ca2a 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -29,7 +29,7 @@
 #include "fldpage.hxx"
 #include <IDocumentOutlineNodes.hxx>
 #include <IDocumentListItems.hxx>
-#include <FldRefTreeListBox.hxx>
+#include "FldRefTreeListBox.hxx"
 class SwTextNode;
 
 class SwFieldRefPage : public SwFieldPage
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index 938a8d6bfb67..2dedd4a1a9c5 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -28,12 +28,12 @@
 #include <viewopt.hxx>
 #include <docsh.hxx>
 #include <fldwrap.hxx>
-#include <flddb.hxx>
-#include <flddinf.hxx>
-#include <fldvar.hxx>
-#include <flddok.hxx>
-#include <fldfunc.hxx>
-#include <fldref.hxx>
+#include "flddb.hxx"
+#include "flddinf.hxx"
+#include "fldvar.hxx"
+#include "flddok.hxx"
+#include "fldfunc.hxx"
+#include "fldref.hxx"
 #include <wrtsh.hxx>
 #include <view.hxx>
 #include <fldtdlg.hxx>
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index c75ebd8c551f..6c77133554bf 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -30,7 +30,7 @@
 #include <doc.hxx>
 #include <docary.hxx>
 #include <swmodule.hxx>
-#include <fldvar.hxx>
+#include "fldvar.hxx"
 #include <calc.hxx>
 #include <svl/zformat.hxx>
 #include <globals.hrc>
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index 097308ae0c28..4acef8d89de2 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -28,8 +28,8 @@
 #include <vcl/edit.hxx>
 
 #include "fldpage.hxx"
-#include "condedit.hxx"
-#include "numfmtlb.hxx"
+#include <condedit.hxx>
+#include <numfmtlb.hxx>
 
 class SwFieldVarPage;
 
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 0b716fb52c42..e188e3a2a345 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -19,9 +19,9 @@
 
 #include <cstdint>
 
-#include "column.hxx"
+#include <column.hxx>
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
@@ -44,21 +44,21 @@
 #include <sal/macros.h>
 
 #include <helpids.h>
-#include "globals.hrc"
-#include "swtypes.hxx"
-#include "wrtsh.hxx"
-#include "view.hxx"
-#include "docsh.hxx"
-#include "uitool.hxx"
-#include "cmdid.h"
-#include "viewopt.hxx"
-#include "format.hxx"
-#include "frmmgr.hxx"
-#include "frmdlg.hxx"
-#include "colmgr.hxx"
-#include "prcntfld.hxx"
-#include "paratr.hxx"
-#include "strings.hrc"
+#include <globals.hrc>
+#include <swtypes.hxx>
+#include <wrtsh.hxx>
+#include <view.hxx>
+#include <docsh.hxx>
+#include <uitool.hxx>
+#include <cmdid.h>
+#include <viewopt.hxx>
+#include <format.hxx>
+#include <frmmgr.hxx>
+#include <frmdlg.hxx>
+#include <colmgr.hxx>
+#include <prcntfld.hxx>
+#include <paratr.hxx>
+#include <strings.hrc>
 #include <section.hxx>
 #include <docary.hxx>
 #include <pagedesc.hxx>
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index be3309bdfc11..d8bc996a03ce 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/text/XTextFramesSupplier.hpp>
 #include <com/sun/star/text/XTextFrame.hpp>
 #include <comphelper/string.hxx>
-#include "initui.hxx"
+#include <initui.hxx>
 #include <globals.hrc>
 #include <strings.hrc>
 #include <SwStyleNameMapper.hxx>
diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx
index a81dead1fcda..c7c54cac7841 100644
--- a/sw/source/ui/frmdlg/pattern.cxx
+++ b/sw/source/ui/frmdlg/pattern.cxx
@@ -19,9 +19,9 @@
 
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
-#include "swtypes.hxx"
-#include "pattern.hxx"
-#include "strings.hrc"
+#include <swtypes.hxx>
+#include <pattern.hxx>
+#include <strings.hrc>
 
 SwBackgroundDlg::SwBackgroundDlg(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxSingleTabDialog(pParent, rSet)
diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx
index 6f656e149cab..a934461d3b1d 100644
--- a/sw/source/ui/frmdlg/uiborder.cxx
+++ b/sw/source/ui/frmdlg/uiborder.cxx
@@ -25,9 +25,9 @@
 #include <sfx2/tabdlg.hxx>
 #include <svl/intitem.hxx>
 
-#include "swtypes.hxx"
-#include "uiborder.hxx"
-#include "strings.hrc"
+#include <swtypes.hxx>
+#include <uiborder.hxx>
+#include <strings.hrc>
 
 SwBorderDlg::SwBorderDlg(vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType) :
     SfxSingleTabDialog(pParent, rSet)
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 3c3b2e243770..5a9db97e8cee 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hintids.hxx"
+#include <hintids.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/settings.hxx>
 
@@ -30,16 +30,16 @@
 #include <fmtfollowtextflow.hxx>
 #include <svx/swframevalidation.hxx>
 
-#include "cmdid.h"
+#include <cmdid.h>
 #include <docsh.hxx>
-#include "uitool.hxx"
-#include "wrtsh.hxx"
-#include "swmodule.hxx"
-#include "viewopt.hxx"
-#include "frmatr.hxx"
-#include "frmmgr.hxx"
-#include "globals.hrc"
-#include "wrap.hxx"
+#include <uitool.hxx>
+#include <wrtsh.hxx>
+#include <swmodule.hxx>
+#include <viewopt.hxx>
+#include <frmatr.hxx>
+#include <frmmgr.hxx>
+#include <globals.hrc>
+#include <wrap.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index 77c71ca8a394..2b6f65aa58e2 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -30,7 +30,7 @@
 #include <svtools/simptabl.hxx>
 #include <svtools/svtabbx.hxx>
 #include <svtools/headbar.hxx>
-#include "mailmergehelper.hxx"
+#include <mailmergehelper.hxx>
 
 class SwMailMergeWizard;
 class SfxPrinter;
diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx
index c53f6aa1702b..0e16c05355ae 100644
--- a/sw/source/ui/index/multmrk.cxx
+++ b/sw/source/ui/index/multmrk.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "swtypes.hxx"
+#include <swtypes.hxx>
 
-#include "multmrk.hxx"
-#include "toxmgr.hxx"
+#include <multmrk.hxx>
+#include <toxmgr.hxx>
 
 SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr& rTOXMgr)
     : SvxStandardDialog(pParent, "SelectIndexDialog",
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 01ea94b7caca..c3266c823339 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "swuiidxmrk.hxx"
+#include <swuiidxmrk.hxx>
 #include <hintids.hxx>
 #include <helpids.h>
 #include <comphelper/processfactory.hxx>
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index e14f620647f1..3e262e984b46 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -26,16 +26,16 @@
 #include <svtools/treelistentry.hxx>
 #include <com/sun/star/text/XBookmarksSupplier.hpp>
 
-#include "swabstdlg.hxx"
-#include "swuiexp.hxx"
-#include "view.hxx"
-#include "basesh.hxx"
-#include "wrtsh.hxx"
-#include "cmdid.h"
-#include "bookmark.hxx"
-#include "docsh.hxx"
-#include "globals.hrc"
-#include "strings.hrc"
+#include <swabstdlg.hxx>
+#include <swuiexp.hxx>
+#include <view.hxx>
+#include <basesh.hxx>
+#include <wrtsh.hxx>
+#include <cmdid.h>
+#include <bookmark.hxx>
+#include <docsh.hxx>
+#include <globals.hrc>
+#include <strings.hrc>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 97a123b4dc96..399a7acd913f 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -22,7 +22,7 @@
 #include <view.hxx>
 #include <docsh.hxx>
 #include <docfnote.hxx>
-#include <impfnote.hxx>
+#include "impfnote.hxx"
 #include <ftninfo.hxx>
 #include <fmtcol.hxx>
 #include <pagedesc.hxx>
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 8b6d9a04693f..b32b06f1adae 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -70,7 +70,7 @@
 
 #include <memory>
 
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index 7da52e4b8172..011c075d13cc 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -27,12 +27,12 @@
 
 #include <docstyle.hxx>
 
-#include "fldbas.hxx"
-#include "lineinfo.hxx"
-#include "linenum.hxx"
-#include "uitool.hxx"
+#include <fldbas.hxx>
+#include <lineinfo.hxx>
+#include <linenum.hxx>
+#include <uitool.hxx>
 #include <fmtline.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 
 #include <IDocumentStylePoolAccess.hxx>
 
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index c9b37dbeefb4..ffd65c2372e6 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -35,11 +35,11 @@
 #include <pggrid.hxx>
 #include <tgrditem.hxx>
 
-#include "wrtsh.hxx"
-#include "doc.hxx"
-#include "uiitems.hxx"
-#include "swmodule.hxx"
-#include "view.hxx"
+#include <wrtsh.hxx>
+#include <doc.hxx>
+#include <uiitems.hxx>
+#include <swmodule.hxx>
+#include <view.hxx>
 
 SwTextGridPage::SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet) :
     SfxTabPage(pParent, "TextGridPage", "modules/swriter/ui/textgridpage.ui", &rSet),
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 2f95f2fe170a..d3195845daff 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -19,7 +19,7 @@
 
 #include <cstdint>
 
-#include "srtdlg.hxx"
+#include <srtdlg.hxx>
 
 #include <vcl/lstbox.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
index e98e86573177..b70bc390259a 100644
--- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
+++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
@@ -38,7 +38,7 @@
 
 #include <vector>
 #include <redlndlg.hxx>
-#include "swmodalredlineacceptdlg.hxx"
+#include <swmodalredlineacceptdlg.hxx>
 
 #include <unomid.h>
 
diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index 9a176b95c986..9d1596159364 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -17,13 +17,13 @@
 #include <charfmt.hxx>
 #include <docstyle.hxx>
 
-#include "fldbas.hxx"
-#include "lineinfo.hxx"
-#include "globals.hrc"
-#include "titlepage.hxx"
-#include "uitool.hxx"
-#include "fmtpdsc.hxx"
-#include "pagedesc.hxx"
+#include <fldbas.hxx>
+#include <lineinfo.hxx>
+#include <globals.hrc>
+#include <titlepage.hxx>
+#include <uitool.hxx>
+#include <fmtpdsc.hxx>
+#include <pagedesc.hxx>
 
 #include <IDocumentStylePoolAccess.hxx>
 
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index c02dc9e3f6ec..5f05e1e8d6e6 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -23,17 +23,17 @@
 #include <modcfg.hxx>
 #include <sfx2/htmlmode.hxx>
 #include <viewopt.hxx>
-#include "swmodule.hxx"
-#include "cmdid.h"
-#include "convert.hxx"
-#include "tablemgr.hxx"
-#include "wrtsh.hxx"
-#include "view.hxx"
-#include "tblafmt.hxx"
-
-#include "app.hrc"
-#include "strings.hrc"
-#include "swabstdlg.hxx"
+#include <swmodule.hxx>
+#include <cmdid.h>
+#include <convert.hxx>
+#include <tablemgr.hxx>
+#include <wrtsh.hxx>
+#include <view.hxx>
+#include <tblafmt.hxx>
+
+#include <app.hrc>
+#include <strings.hrc>
+#include <swabstdlg.hxx>
 #include <swuiexp.hxx>
 #include <memory>
 
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index 7131bf2b5238..dd0d1ad25947 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -19,17 +19,17 @@
 
 #include <vcl/msgbox.hxx>
 
-#include "wrtsh.hxx"
-#include "view.hxx"
-#include "itabenum.hxx"
-#include "instable.hxx"
-#include "tblafmt.hxx"
-#include "modcfg.hxx"
-#include "swmodule.hxx"
+#include <wrtsh.hxx>
+#include <view.hxx>
+#include <itabenum.hxx>
+#include <instable.hxx>
+#include <tblafmt.hxx>
+#include <modcfg.hxx>
+#include <swmodule.hxx>
 #include <sfx2/htmlmode.hxx>
 #include <viewopt.hxx>
 
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
 #include <swuiexp.hxx>
 #include <memory>
 
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 54df66d78c5b..64270c3248a2 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -37,7 +37,7 @@
 #include <fmtrowsplt.hxx>
 #include <sfx2/htmlmode.hxx>
 
-#include "strings.hrc"
+#include <strings.hrc>
 
 #include <docsh.hxx>
 #include <wrtsh.hxx>
@@ -46,7 +46,7 @@
 #include <uitool.hxx>
 #include <frmatr.hxx>
 #include <tabledlg.hxx>
-#include <../../uibase/table/tablepg.hxx>
+#include "../../uibase/table/tablepg.hxx"
 #include <tablemgr.hxx>
 #include <pagedesc.hxx>
 #include <uiitems.hxx>
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index b4262c440982..195048326248 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -33,15 +33,15 @@
 #include <svx/framelinkarray.hxx>
 #include <drawinglayer/processor2d/processor2dtools.hxx>
 
-#include "app.hrc"
-#include "strings.hrc"
-#include "swmodule.hxx"
-#include "swtypes.hxx"
-#include "view.hxx"
-#include "wrtsh.hxx"
-#include "tblafmt.hxx"
-#include "tautofmt.hxx"
-#include "shellres.hxx"
+#include <app.hrc>
+#include <strings.hrc>
+#include <swmodule.hxx>
+#include <swtypes.hxx>
+#include <view.hxx>
+#include <wrtsh.hxx>
+#include <tblafmt.hxx>
+#include <tautofmt.hxx>
+#include <shellres.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx
index e9b4fbb226de..ad4333fb71af 100644
--- a/sw/source/ui/utlui/swrenamexnameddlg.cxx
+++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx
@@ -45,7 +45,7 @@
 #include <swmodule.hxx>
 #include <unocrsr.hxx>
 
-#include "swrenamexnameddlg.hxx"
+#include <swrenamexnameddlg.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx
index f4d0dbf456f8..3864993f0ed5 100644
--- a/sw/source/ui/vba/service.cxx
+++ b/sw/source/ui/vba/service.cxx
@@ -19,7 +19,7 @@
 #include <cppuhelper/implementationentry.hxx>
 #include <comphelper/servicedecl.hxx>
 
-#include <service.hxx>
+#include "service.hxx"
 
 // component exports
 
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index 24f021ba0b2b..74fff4532741 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -37,7 +37,7 @@
 #include <ooo/vba/word/WdProtectionType.hpp>
 
 #include <vbahelper/helperdecl.hxx>
-#include <wordvbahelper.hxx>
+#include "wordvbahelper.hxx"
 #include <docsh.hxx>
 #include "vbatemplate.hxx"
 #include "vbaparagraph.hxx"
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index be3151ea7458..2b31ebe73992 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -26,8 +26,8 @@
 #include <ooo/vba/office/MsoDocProperties.hpp>
 #include <memory>
 #include "wordvbahelper.hxx"
-#include "fesh.hxx"
-#include "docsh.hxx"
+#include <fesh.hxx>
+#include <docsh.hxx>
 using namespace ::ooo::vba;
 using namespace css;
 
diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index 14bef8e35a26..e7436e7baa0d 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -36,8 +36,8 @@
 #include <ooo/vba/word/XApplication.hpp>
 #include <ooo/vba/word/WdCollapseDirection.hpp>
 #include <com/sun/star/text/XPageCursor.hpp>
-#include "unotbl.hxx"
-#include "unocoll.hxx"
+#include <unotbl.hxx>
+#include <unocoll.hxx>
 #include "vbatable.hxx"
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/view/XViewCursor.hpp>
diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx
index 0ee6d59a50ef..804c4ef3d374 100644
--- a/sw/source/uibase/envelp/envimg.cxx
+++ b/sw/source/uibase/envelp/envimg.cxx
@@ -28,7 +28,7 @@
 #include <swmodule.hxx>
 #include <swtypes.hxx>
 #include <envimg.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 
 #include <cmdid.h>
 
diff --git a/sw/source/uibase/inc/FrameControlsManager.hxx b/sw/source/uibase/inc/FrameControlsManager.hxx
index bbaf6be502f2..af34bae99d10 100644
--- a/sw/source/uibase/inc/FrameControlsManager.hxx
+++ b/sw/source/uibase/inc/FrameControlsManager.hxx
@@ -10,7 +10,7 @@
 #define INCLUDED_SW_SOURCE_UIBASE_INC_FRAMECONTROLSMANAGER_HXX
 
 #include <viewsh.hxx>
-#include <FrameControl.hxx>
+#include "FrameControl.hxx"
 
 #include <tools/gen.hxx>
 
diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx
index da51beef7ab5..ba45f41fab88 100644
--- a/sw/source/uibase/inc/HeaderFooterWin.hxx
+++ b/sw/source/uibase/inc/HeaderFooterWin.hxx
@@ -9,7 +9,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_HEADERFOOTERWIN_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_HEADERFOOTERWIN_HXX
 
-#include <FrameControl.hxx>
+#include "FrameControl.hxx"
 #include <vcl/builder.hxx>
 #include <vcl/menubtn.hxx>
 
diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx
index 995154ce6ced..c659be062f0d 100644
--- a/sw/source/uibase/inc/PageBreakWin.hxx
+++ b/sw/source/uibase/inc/PageBreakWin.hxx
@@ -9,7 +9,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_PAGEBREAKWIN_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_PAGEBREAKWIN_HXX
 
-#include <FrameControl.hxx>
+#include "FrameControl.hxx"
 #include <vcl/builder.hxx>
 #include <vcl/menubtn.hxx>
 
diff --git a/sw/source/uibase/inc/beziersh.hxx b/sw/source/uibase/inc/beziersh.hxx
index 76204f87471a..abf64aa65533 100644
--- a/sw/source/uibase/inc/beziersh.hxx
+++ b/sw/source/uibase/inc/beziersh.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_BEZIERSH_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_BEZIERSH_HXX
 
-#include <basesh.hxx>
+#include "basesh.hxx"
 
 class SwBezierShell: public SwBaseShell
 {
diff --git a/sw/source/uibase/inc/changedb.hxx b/sw/source/uibase/inc/changedb.hxx
index 31210fdb09f1..23ae2c6430a2 100644
--- a/sw/source/uibase/inc/changedb.hxx
+++ b/sw/source/uibase/inc/changedb.hxx
@@ -24,7 +24,7 @@
 #include <vcl/fixed.hxx>
 #include <svtools/treelistbox.hxx>
 #include <svx/stddlg.hxx>
-#include <dbtree.hxx>
+#include "dbtree.hxx"
 
 class SwFieldMgr;
 class SwView;
diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx
index 5a955aa3dd60..1e89dedeef25 100644
--- a/sw/source/uibase/inc/chrdlg.hxx
+++ b/sw/source/uibase/inc/chrdlg.hxx
@@ -26,7 +26,7 @@
 #include <vcl/combobox.hxx>
 #include <vcl/button.hxx>
 #include <vcl/lstbox.hxx>
-#include <chrdlgmodes.hxx>
+#include "chrdlgmodes.hxx"
 
 class SwView;
 class SvxMacroItem;
diff --git a/sw/source/uibase/inc/cnttab.hxx b/sw/source/uibase/inc/cnttab.hxx
index 594ace19869b..74433e54d30f 100644
--- a/sw/source/uibase/inc/cnttab.hxx
+++ b/sw/source/uibase/inc/cnttab.hxx
@@ -28,7 +28,7 @@
 #include <sfx2/tabdlg.hxx>
 
 #include <tox.hxx>
-#include <toxmgr.hxx>
+#include "toxmgr.hxx"
 #include <svx/checklbx.hxx>
 #include <svtools/treelistbox.hxx>
 #include <vcl/menubtn.hxx>
diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index 5e129e3d0f20..531a914c3445 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -33,8 +33,8 @@
 #include <sfx2/tabdlg.hxx>
 #include <svx/colorbox.hxx>
 #include <fmtclbl.hxx>
-#include <colex.hxx>
-#include <prcntfld.hxx>
+#include "colex.hxx"
+#include "prcntfld.hxx"
 
 const int nMaxCols = 99;
 class SwColMgr;
diff --git a/sw/source/uibase/inc/conarc.hxx b/sw/source/uibase/inc/conarc.hxx
index 2c5011615da4..b1b31ec03780 100644
--- a/sw/source/uibase/inc/conarc.hxx
+++ b/sw/source/uibase/inc/conarc.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONARC_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_CONARC_HXX
 
-#include <drawbase.hxx>
+#include "drawbase.hxx"
 
 // draw rectangle
 class ConstArc : public SwDrawBase
diff --git a/sw/source/uibase/inc/concustomshape.hxx b/sw/source/uibase/inc/concustomshape.hxx
index 1116babc0c28..4d67a00dd8f2 100644
--- a/sw/source/uibase/inc/concustomshape.hxx
+++ b/sw/source/uibase/inc/concustomshape.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SW_SOURCE_UIBASE_INC_CONCUSTOMSHAPE_HXX
 
 #include <rtl/ustring.hxx>
-#include <drawbase.hxx>
+#include "drawbase.hxx"
 
 class SdrObject;
 class SfxRequest;
diff --git a/sw/source/uibase/inc/conform.hxx b/sw/source/uibase/inc/conform.hxx
index d51028075b3e..65e01caf98ce 100644
--- a/sw/source/uibase/inc/conform.hxx
+++ b/sw/source/uibase/inc/conform.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONFORM_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_CONFORM_HXX
 
-#include <drawbase.hxx>
+#include "drawbase.hxx"
 
 class ConstFormControl : public SwDrawBase
 {
diff --git a/sw/source/uibase/inc/conpoly.hxx b/sw/source/uibase/inc/conpoly.hxx
index 29f71b9413c2..f3276e3a2fef 100644
--- a/sw/source/uibase/inc/conpoly.hxx
+++ b/sw/source/uibase/inc/conpoly.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONPOLY_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_CONPOLY_HXX
 
-#include <drawbase.hxx>
+#include "drawbase.hxx"
 
 // base class for all functions
 class ConstPolygon : public SwDrawBase
diff --git a/sw/source/uibase/inc/conrect.hxx b/sw/source/uibase/inc/conrect.hxx
index 94cb2fc4a875..878d99c8031e 100644
--- a/sw/source/uibase/inc/conrect.hxx
+++ b/sw/source/uibase/inc/conrect.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONRECT_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_CONRECT_HXX
 
-#include <drawbase.hxx>
+#include "drawbase.hxx"
 
 // draw rectangle
 class ConstRectangle : public SwDrawBase
diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx
index 0f4d7e57f6d7..d579346fecca 100644
--- a/sw/source/uibase/inc/content.hxx
+++ b/sw/source/uibase/inc/content.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SW_SOURCE_UIBASE_INC_CONTENT_HXX
 #include <memory>
 #include <limits.h>
-#include <swcont.hxx>
+#include "swcont.hxx"
 
 #include <vcl/menu.hxx>
 
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index 4286fcd11d76..e2e0b62e5435 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -22,7 +22,7 @@
 #include <svl/lstner.hxx>
 #include <svtools/treelistbox.hxx>
 #include <svtools/svlbitm.hxx>
-#include <swcont.hxx>
+#include "swcont.hxx"
 
 #include <map>
 #include <memory>
diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx
index 8b2b448a22ed..ded6d36b9dc8 100644
--- a/sw/source/uibase/inc/cption.hxx
+++ b/sw/source/uibase/inc/cption.hxx
@@ -25,12 +25,12 @@
 #include <vcl/edit.hxx>
 #include <vcl/group.hxx>
 #include <vcl/button.hxx>
-#include <actctrl.hxx>
+#include "actctrl.hxx"
 
 #include <com/sun/star/container/XNameAccess.hpp>
 
-#include <wrtsh.hxx>
-#include <optload.hxx>
+#include "wrtsh.hxx"
+#include "optload.hxx"
 
 class SwFieldMgr;
 class SwView;
diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx
index 34d8e5c58e4b..94214ef4e37a 100644
--- a/sw/source/uibase/inc/dbinsdlg.hxx
+++ b/sw/source/uibase/inc/dbinsdlg.hxx
@@ -29,7 +29,7 @@
 #include <svtools/svmedit.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <unotools/configitem.hxx>
-#include <numfmtlb.hxx>
+#include "numfmtlb.hxx"
 #include <swdbdata.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
diff --git a/sw/source/uibase/inc/drawsh.hxx b/sw/source/uibase/inc/drawsh.hxx
index 0676f1a207f1..e0fd449e4bf8 100644
--- a/sw/source/uibase/inc/drawsh.hxx
+++ b/sw/source/uibase/inc/drawsh.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DRAWSH_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_DRAWSH_HXX
 
-#include <drwbassh.hxx>
+#include "drwbassh.hxx"
 
 class SwDrawBaseShell;
 
diff --git a/sw/source/uibase/inc/drformsh.hxx b/sw/source/uibase/inc/drformsh.hxx
index 03fe52413164..9c8602d149ba 100644
--- a/sw/source/uibase/inc/drformsh.hxx
+++ b/sw/source/uibase/inc/drformsh.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DRFORMSH_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_DRFORMSH_HXX
 
-#include <drwbassh.hxx>
+#include "drwbassh.hxx"
 
 class SwDrawBaseShell;
 
diff --git a/sw/source/uibase/inc/drwbassh.hxx b/sw/source/uibase/inc/drwbassh.hxx
index ea2835682a1b..e75576dec2a0 100644
--- a/sw/source/uibase/inc/drwbassh.hxx
+++ b/sw/source/uibase/inc/drwbassh.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DRWBASSH_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_DRWBASSH_HXX
 
-#include <basesh.hxx>
+#include "basesh.hxx"
 
 class SwView;
 class SfxItemSet;
diff --git a/sw/source/uibase/inc/dselect.hxx b/sw/source/uibase/inc/dselect.hxx
index 3fdc2c7c7c95..c3996640bc41 100644
--- a/sw/source/uibase/inc/dselect.hxx
+++ b/sw/source/uibase/inc/dselect.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DSELECT_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_DSELECT_HXX
 
-#include <drawbase.hxx>
+#include "drawbase.hxx"
 
 // draw rectangle
 class DrawSelection : public SwDrawBase
diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx
index d82e35d376f3..2e0c43dec906 100644
--- a/sw/source/uibase/inc/envlop.hxx
+++ b/sw/source/uibase/inc/envlop.hxx
@@ -30,7 +30,7 @@
 
 #include <vcl/button.hxx>
 
-#include <envimg.hxx>
+#include "envimg.hxx"
 
 #define GetFieldVal(rField)         (rField).Denormalize((rField).GetValue(FUNIT_TWIP))
 #define SetFieldVal(rField, lValue) (rField).SetValue((rField).Normalize(lValue), FUNIT_TWIP)
diff --git a/sw/source/uibase/inc/fldwrap.hxx b/sw/source/uibase/inc/fldwrap.hxx
index 9cec27ab26f9..0d8b58e7142c 100644
--- a/sw/source/uibase/inc/fldwrap.hxx
+++ b/sw/source/uibase/inc/fldwrap.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FLDWRAP_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_FLDWRAP_HXX
 
-#include <chldwrap.hxx>
+#include "chldwrap.hxx"
 class AbstractSwFieldDlg;
 
 class SwFieldDlgWrapper : public SwChildWinWrapper
diff --git a/sw/source/uibase/inc/formatclipboard.hxx b/sw/source/uibase/inc/formatclipboard.hxx
index d5564ed5cc69..262ecfc68538 100644
--- a/sw/source/uibase/inc/formatclipboard.hxx
+++ b/sw/source/uibase/inc/formatclipboard.hxx
@@ -24,7 +24,7 @@
 
 #include <memory>
 
-#include <wrtsh.hxx>
+#include "wrtsh.hxx"
 #include <svl/itemset.hxx>
 #include <svl/style.hxx>
 
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index 45c5fd0c5cde..bc6ee6950b97 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -27,9 +27,9 @@
 #include <sfx2/tabdlg.hxx>
 #include <svx/swframeposstrings.hxx>
 #include <swtypes.hxx>
-#include <bmpwin.hxx>
+#include "bmpwin.hxx"
 #include <svx/swframeexample.hxx>
-#include <prcntfld.hxx>
+#include "prcntfld.hxx"
 #include <globals.hrc>
 #include <svx/dialcontrol.hxx>
 
diff --git a/sw/source/uibase/inc/frmsh.hxx b/sw/source/uibase/inc/frmsh.hxx
index e6c91cbd1756..f86e0d06501f 100644
--- a/sw/source/uibase/inc/frmsh.hxx
+++ b/sw/source/uibase/inc/frmsh.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FRMSH_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_FRMSH_HXX
 
-#include <basesh.hxx>
+#include "basesh.hxx"
 
 class SwFrameShell: public SwBaseShell
 {
diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx
index 32e22554b067..d6bf120c5290 100644
--- a/sw/source/uibase/inc/glossary.hxx
+++ b/sw/source/uibase/inc/glossary.hxx
@@ -33,7 +33,7 @@
 
 #include <rtl/ustring.hxx>
 
-#include <actctrl.hxx>
+#include "actctrl.hxx"
 
 class SwGlossaryHdl;
 class SwNewGlosNameDlg;
diff --git a/sw/source/uibase/inc/grfsh.hxx b/sw/source/uibase/inc/grfsh.hxx
index 56224db64f5c..139a7a8dfd12 100644
--- a/sw/source/uibase/inc/grfsh.hxx
+++ b/sw/source/uibase/inc/grfsh.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SW_SOURCE_UIBASE_INC_GRFSH_HXX
 
 #include <memory>
-#include <frmsh.hxx>
+#include "frmsh.hxx"
 
 class SwGrfShell: public SwBaseShell
 {
diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx
index c1698b02654a..1c8d7a4cab86 100644
--- a/sw/source/uibase/inc/instable.hxx
+++ b/sw/source/uibase/inc/instable.hxx
@@ -25,7 +25,7 @@
 #include <vcl/edit.hxx>
 #include <vcl/layout.hxx>
 #include <sfx2/basedlgs.hxx>
-#include <actctrl.hxx>
+#include "actctrl.hxx"
 
 class SwWrtShell;
 class SwTableAutoFormat;
diff --git a/sw/source/uibase/inc/label.hxx b/sw/source/uibase/inc/label.hxx
index a11ccfec6d88..5eabaef5b6cd 100644
--- a/sw/source/uibase/inc/label.hxx
+++ b/sw/source/uibase/inc/label.hxx
@@ -21,7 +21,7 @@
 
 #include <sfx2/tabdlg.hxx>
 #include <com/sun/star/frame/XModel.hpp>
-#include <labelcfg.hxx>
+#include "labelcfg.hxx"
 #include <vector>
 
 class SwLabItem;
diff --git a/sw/source/uibase/inc/labelcfg.hxx b/sw/source/uibase/inc/labelcfg.hxx
index 9dbbd285cfea..c206f67de809 100644
--- a/sw/source/uibase/inc/labelcfg.hxx
+++ b/sw/source/uibase/inc/labelcfg.hxx
@@ -21,7 +21,7 @@
 
 #include <unotools/configitem.hxx>
 #include <swdllapi.h>
-#include <labrec.hxx>
+#include "labrec.hxx"
 
 #include <map>
 #include <vector>
diff --git a/sw/source/uibase/inc/labimp.hxx b/sw/source/uibase/inc/labimp.hxx
index 141b801be12f..b6034827efd7 100644
--- a/sw/source/uibase/inc/labimp.hxx
+++ b/sw/source/uibase/inc/labimp.hxx
@@ -25,8 +25,8 @@
 #include <svtools/svmedit.hxx>
 #include <vcl/field.hxx>
 #include <svtools/treelistbox.hxx>
-#include <label.hxx>
-#include <labimg.hxx>
+#include "label.hxx"
+#include "labimg.hxx"
 
 #define GETFLDVAL(rField)         (rField).Denormalize((rField).GetValue(FUNIT_TWIP))
 #define SETFLDVAL(rField, lValue) (rField).SetValue((rField).Normalize(lValue), FUNIT_TWIP)
diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx
index 5f0af2b410a6..d3139e52c7d0 100644
--- a/sw/source/uibase/inc/linenum.hxx
+++ b/sw/source/uibase/inc/linenum.hxx
@@ -23,7 +23,7 @@
 #include <vcl/button.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/lstbox.hxx>
-#include <numberingtypelistbox.hxx>
+#include "numberingtypelistbox.hxx"
 
 namespace vcl { class Window; }
 class SwView;
diff --git a/sw/source/uibase/inc/listsh.hxx b/sw/source/uibase/inc/listsh.hxx
index d04a64b28362..0caecf64282e 100644
--- a/sw/source/uibase/inc/listsh.hxx
+++ b/sw/source/uibase/inc/listsh.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_LISTSH_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_LISTSH_HXX
 
-#include <basesh.hxx>
+#include "basesh.hxx"
 
 class SwListShell: public SwBaseShell
 {
diff --git a/sw/source/uibase/inc/mediash.hxx b/sw/source/uibase/inc/mediash.hxx
index 4ac0f0a0f42c..68f13ca215fe 100644
--- a/sw/source/uibase/inc/mediash.hxx
+++ b/sw/source/uibase/inc/mediash.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MEDIASH_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_MEDIASH_HXX
 
-#include <frmsh.hxx>
+#include "frmsh.hxx"
 
 class SwMediaShell: public SwBaseShell
 {
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx
index 80e0df0588da..72ad3253a103 100644
--- a/sw/source/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/uibase/inc/mmconfigitem.hxx
@@ -27,7 +27,7 @@
 #include <vector>
 #include <swdbdata.hxx>
 #include <swdllapi.h>
-#include <sharedconnection.hxx>
+#include "sharedconnection.hxx"
 
 namespace com{namespace sun{namespace star{
     namespace sdbc{
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index 6e37fe6996bb..8dd55101fc1e 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -28,7 +28,7 @@
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <svx/sidebar/PanelLayout.hxx>
-#include <conttree.hxx>
+#include "conttree.hxx"
 #include <ndarr.hxx>
 
 class SwWrtShell;
diff --git a/sw/source/uibase/inc/navsh.hxx b/sw/source/uibase/inc/navsh.hxx
index ebda6aa40291..287c0acb2cad 100644
--- a/sw/source/uibase/inc/navsh.hxx
+++ b/sw/source/uibase/inc/navsh.hxx
@@ -9,7 +9,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NAVSH_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_NAVSH_HXX
 
-#include <frmsh.hxx>
+#include "frmsh.hxx"
 
 class SfxItemSet;
 
diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx
index 622f44f2b5da..14eb447076a6 100644
--- a/sw/source/uibase/inc/num.hxx
+++ b/sw/source/uibase/inc/num.hxx
@@ -28,7 +28,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/edit.hxx>
 #include <svx/stddlg.hxx>
-#include <numprevw.hxx>
+#include "numprevw.hxx"
 #include <numrule.hxx>
 
 class SwWrtShell;
diff --git a/sw/source/uibase/inc/olesh.hxx b/sw/source/uibase/inc/olesh.hxx
index d60d4b51078d..30979029ed16 100644
--- a/sw/source/uibase/inc/olesh.hxx
+++ b/sw/source/uibase/inc/olesh.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_OLESH_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_OLESH_HXX
 
-#include <frmsh.hxx>
+#include "frmsh.hxx"
 
 class SwOleShell: public SwFrameShell
 {
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index 198a71cc1432..a106d250b885 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.hxx
@@ -29,7 +29,7 @@
 #include <svx/strarray.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <svx/checklbx.hxx>
-#include <caption.hxx>
+#include "caption.hxx"
 
 class SwFieldMgr;
 class SvTreeListEntry;
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index c770edf18bb2..85dc244aed38 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -32,7 +32,7 @@
 #include <svtools/ctrlbox.hxx>
 #include <svx/colorbox.hxx>
 #include <svx/fntctrl.hxx>
-#include <fontcfg.hxx>
+#include "fontcfg.hxx"
 class SfxPrinter;
 class SwStdFontConfig;
 class SwWrtShell;
diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx
index c966e123d09b..5824d55945af 100644
--- a/sw/source/uibase/inc/outline.hxx
+++ b/sw/source/uibase/inc/outline.hxx
@@ -35,8 +35,8 @@
 #include <vcl/field.hxx>
 
 #include <swtypes.hxx>
-#include <numprevw.hxx>
-#include <numberingtypelistbox.hxx>
+#include "numprevw.hxx"
+#include "numberingtypelistbox.hxx"
 #include <rtl/ustring.hxx>
 
 class SwWrtShell;
diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx
index ab560a6baa31..a5852b74f280 100644
--- a/sw/source/uibase/inc/pggrid.hxx
+++ b/sw/source/uibase/inc/pggrid.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SW_SOURCE_UIBASE_INC_PGGRID_HXX
 
 #include <sfx2/tabdlg.hxx>
-#include <colex.hxx>
+#include "colex.hxx"
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 #include <svtools/ctrlbox.hxx>
diff --git a/sw/source/uibase/inc/prcntfld.hxx b/sw/source/uibase/inc/prcntfld.hxx
index f709b51f6424..d08d1f90c178 100644
--- a/sw/source/uibase/inc/prcntfld.hxx
+++ b/sw/source/uibase/inc/prcntfld.hxx
@@ -21,7 +21,7 @@
 
 #include <vcl/field.hxx>
 #include <swdllapi.h>
-#include <uitool.hxx>
+#include "uitool.hxx"
 
 //Wraps a MetricField with extra features
 class SW_DLLPUBLIC PercentField
diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx
index 4b523bddc4b6..b8c647846cfb 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_REDLNDLG_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_REDLNDLG_HXX
 #include <swdllapi.h>
-#include <chldwrap.hxx>
+#include "chldwrap.hxx"
 #include <redline.hxx>
 #include <tools/datetime.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx
index add9aa524eb8..7d24a2b54452 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hxx
@@ -33,12 +33,12 @@
 #include <sfx2/tabdlg.hxx>
 #include <editeng/brushitem.hxx>
 
-#include <condedit.hxx>
+#include "condedit.hxx"
 #include <section.hxx>
 #include <fmtclds.hxx>
 #include <fmtftntx.hxx>
 #include <fmtclbl.hxx>
-#include <numberingtypelistbox.hxx>
+#include "numberingtypelistbox.hxx"
 #include <editeng/frmdiritem.hxx>
 #include <vcl/image.hxx>
 #include <svx/paraprev.hxx>
diff --git a/sw/source/uibase/inc/srcview.hxx b/sw/source/uibase/inc/srcview.hxx
index 5f475df51e82..298983510f4d 100644
--- a/sw/source/uibase/inc/srcview.hxx
+++ b/sw/source/uibase/inc/srcview.hxx
@@ -23,7 +23,7 @@
 #include <sfx2/viewsh.hxx>
 #include <vcl/outdev.hxx>
 
-#include <srcedtw.hxx>
+#include "srcedtw.hxx"
 #include <shellid.hxx>
 
 class SwDocShell;
diff --git a/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx b/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx
index 233a1dda08d4..ca64cf0ba40b 100644
--- a/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx
+++ b/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx
@@ -18,7 +18,7 @@
  */
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWMODALREDLINEACCEPTDLG_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_SWMODALREDLINEACCEPTDLG_HXX
-#include <chldwrap.hxx>
+#include "chldwrap.hxx"
 #include <sfx2/basedlgs.hxx>
 
 class SwRedlineAcceptDlg;
diff --git a/sw/source/uibase/inc/swrenamexnameddlg.hxx b/sw/source/uibase/inc/swrenamexnameddlg.hxx
index 9259fe4d19d0..a0e6552fabde 100644
--- a/sw/source/uibase/inc/swrenamexnameddlg.hxx
+++ b/sw/source/uibase/inc/swrenamexnameddlg.hxx
@@ -23,7 +23,7 @@
 #include <vcl/fixed.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/button.hxx>
-#include <actctrl.hxx>
+#include "actctrl.hxx"
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index 02bffaaaf37b..6405633bbc09 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -32,12 +32,12 @@
 #include <sfx2/tabdlg.hxx>
 
 #include <tox.hxx>
-#include <toxmgr.hxx>
+#include "toxmgr.hxx"
 #include <svx/checklbx.hxx>
 #include <svtools/treelistbox.hxx>
 #include <vcl/menubtn.hxx>
 #include <svx/langbox.hxx>
-#include <cnttab.hxx>
+#include "cnttab.hxx"
 #include <vector>
 
 class IndexEntryResource;
diff --git a/sw/source/uibase/inc/swuipardlg.hxx b/sw/source/uibase/inc/swuipardlg.hxx
index da76e1e7e316..13c0775459dd 100644
--- a/sw/source/uibase/inc/swuipardlg.hxx
+++ b/sw/source/uibase/inc/swuipardlg.hxx
@@ -18,7 +18,7 @@
  */
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWUIPARDLG_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_SWUIPARDLG_HXX
-#include <pardlg.hxx>
+#include "pardlg.hxx"
 
 class SwParaDlg: public SfxTabDialog
 {
diff --git a/sw/source/uibase/inc/tabledlg.hxx b/sw/source/uibase/inc/tabledlg.hxx
index eebd8922973d..ea16661dda27 100644
--- a/sw/source/uibase/inc/tabledlg.hxx
+++ b/sw/source/uibase/inc/tabledlg.hxx
@@ -22,7 +22,7 @@
 #include <sfx2/tabdlg.hxx>
 
 #include <swtypes.hxx>
-#include <swtablerep.hxx>
+#include "swtablerep.hxx"
 
 class SwWrtShell;
 struct TColumn;
diff --git a/sw/source/uibase/inc/tabsh.hxx b/sw/source/uibase/inc/tabsh.hxx
index d2cb119539bb..c29d822a7a57 100644
--- a/sw/source/uibase/inc/tabsh.hxx
+++ b/sw/source/uibase/inc/tabsh.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_TABSH_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_TABSH_HXX
 
-#include <basesh.hxx>
+#include "basesh.hxx"
 #include <swdllapi.h>
 
 class SfxItemSet;
diff --git a/sw/source/uibase/inc/textsh.hxx b/sw/source/uibase/inc/textsh.hxx
index 4f64ff6b92f9..af865e56ed63 100644
--- a/sw/source/uibase/inc/textsh.hxx
+++ b/sw/source/uibase/inc/textsh.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_TEXTSH_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_TEXTSH_HXX
 
-#include <basesh.hxx>
+#include "basesh.hxx"
 #include <unotools/caserotate.hxx>
 
 class AbstractSvxPostItDialog;
diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx
index de709bc702f5..18bd3d93f161 100644
--- a/sw/source/uibase/inc/titlepage.hxx
+++ b/sw/source/uibase/inc/titlepage.hxx
@@ -15,7 +15,7 @@
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
-#include <numberingtypelistbox.hxx>
+#include "numberingtypelistbox.hxx"
 
 namespace vcl { class Window; }
 class SwWrtShell;
diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx
index 842ab07e267b..3bdba7867954 100644
--- a/sw/source/uibase/inc/unomod.hxx
+++ b/sw/source/uibase/inc/unomod.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/ChainablePropertySet.hxx>
-#include <usrpref.hxx>
+#include "usrpref.hxx"
 
 class SwView;
 class SwViewOption;
diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx
index c97e77d1d46b..688475720b5e 100644
--- a/sw/source/uibase/inc/unotools.hxx
+++ b/sw/source/uibase/inc/unotools.hxx
@@ -25,7 +25,7 @@
 #include <vcl/fixed.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/idle.hxx>
-#include <actctrl.hxx>
+#include "actctrl.hxx"
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/awt/XControl.hpp>
diff --git a/sw/source/uibase/inc/wformsh.hxx b/sw/source/uibase/inc/wformsh.hxx
index c34dddb336e6..dfce5359f1e3 100644
--- a/sw/source/uibase/inc/wformsh.hxx
+++ b/sw/source/uibase/inc/wformsh.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WFORMSH_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_WFORMSH_HXX
 
-#include <drformsh.hxx>
+#include "drformsh.hxx"
 
 class SwWebDrawFormShell : public SwDrawFormShell
 {
diff --git a/sw/source/uibase/inc/wfrmsh.hxx b/sw/source/uibase/inc/wfrmsh.hxx
index b2aecbf22567..15cd8a8b7a63 100644
--- a/sw/source/uibase/inc/wfrmsh.hxx
+++ b/sw/source/uibase/inc/wfrmsh.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WFRMSH_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_WFRMSH_HXX
 
-#include <frmsh.hxx>
+#include "frmsh.hxx"
 
 class SwWebFrameShell: public SwFrameShell
 {
diff --git a/sw/source/uibase/inc/wgrfsh.hxx b/sw/source/uibase/inc/wgrfsh.hxx
index 9c4271989f26..65987a423958 100644
--- a/sw/source/uibase/inc/wgrfsh.hxx
+++ b/sw/source/uibase/inc/wgrfsh.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WGRFSH_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_WGRFSH_HXX
 
-#include <grfsh.hxx>
+#include "grfsh.hxx"
 
 class SwWebGrfShell: public SwGrfShell
 {
diff --git a/sw/source/uibase/inc/wlistsh.hxx b/sw/source/uibase/inc/wlistsh.hxx
index 1c738e8d687e..f3a1179a6f60 100644
--- a/sw/source/uibase/inc/wlistsh.hxx
+++ b/sw/source/uibase/inc/wlistsh.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WLISTSH_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_WLISTSH_HXX
 
-#include <listsh.hxx>
+#include "listsh.hxx"
 
 class SwWebListShell: public SwListShell
 {
diff --git a/sw/source/uibase/inc/wolesh.hxx b/sw/source/uibase/inc/wolesh.hxx
index 9ac3a254a6ee..017768aace59 100644
--- a/sw/source/uibase/inc/wolesh.hxx
+++ b/sw/source/uibase/inc/wolesh.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WOLESH_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_WOLESH_HXX
 
-#include <olesh.hxx>
+#include "olesh.hxx"
 
 class SwWebOleShell: public SwOleShell
 {
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index 4cb1be61db31..9f592df77473 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -24,7 +24,7 @@
 #include <sortopt.hxx>
 #include <swurl.hxx>
 #include <IMark.hxx>
-#include <navmgr.hxx>
+#include "navmgr.hxx"
 #include <boost/optional.hpp>
 #include <o3tl/typed_flags_set.hxx>
 
diff --git a/sw/source/uibase/inc/wtabsh.hxx b/sw/source/uibase/inc/wtabsh.hxx
index 9e44bcf5d5ed..0411750194a5 100644
--- a/sw/source/uibase/inc/wtabsh.hxx
+++ b/sw/source/uibase/inc/wtabsh.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WTABSH_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_WTABSH_HXX
 
-#include <tabsh.hxx>
+#include "tabsh.hxx"
 
 class SwWebTableShell: public SwTableShell
 {
diff --git a/sw/source/uibase/inc/wtextsh.hxx b/sw/source/uibase/inc/wtextsh.hxx
index 494b2fa1b834..7924fdf903d9 100644
--- a/sw/source/uibase/inc/wtextsh.hxx
+++ b/sw/source/uibase/inc/wtextsh.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WTEXTSH_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_WTEXTSH_HXX
 
-#include <textsh.hxx>
+#include "textsh.hxx"
 
 class SwWebTextShell: public SwTextShell
 {
author	Stephan Bergmann <sbergman@redhat.com>	2017-10-23 22:30:30 +0200
committer	Stephan Bergmann <sbergman@redhat.com>	2017-10-23 22:45:50 +0200
commit	62f47bb2a54536d6e1cf14b16d2e3b963ba651a6 (patch)
tree	9190a17b910c36a44dee1b6e8d84460f53a16fa9 /sw
parent	34307a8a7da7def2f3ee207c08b59a48864a03f8 (diff)