sw: always use "" for includes in current source's directory

Change-Id: Ida715fad0c4587a9566184180bf159da12470dd7
Reviewed-on: https://gerrit.libreoffice.org/43207
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

93 files changed, 204 insertions, 177 deletions

diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index f1756996c17d..78ac8fe2a8c8 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -30,12 +30,12 @@
 #include <swtable.hxx>
 #include "crsrsh.hxx"
 #include "viscrs.hxx"
-#include <accfrmobj.hxx>
-#include <accfrmobjslist.hxx>
+#include "accfrmobj.hxx"
+#include "accfrmobjslist.hxx"
 #include "frmfmt.hxx"
 #include "cellatr.hxx"
 #include "accmap.hxx"
-#include <acccell.hxx>
+#include "acccell.hxx"
 
 #include <cfloat>
 #include <limits.h>
diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx
index 9f3472067b01..64fbd3a86893 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -22,7 +22,7 @@
 
 #include "acccontext.hxx"
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#include <accselectionhelper.hxx>
+#include "accselectionhelper.hxx"
 
 class SwCellFrame;
 class SwAccessibleTable;
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 3d80e18e7476..a43cd5a75e08 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -42,8 +42,8 @@
 #include <pam.hxx>
 #include <viewimp.hxx>
 #include <accmap.hxx>
-#include <accfrmobjslist.hxx>
-#include <acccontext.hxx>
+#include "accfrmobjslist.hxx"
+#include "acccontext.hxx"
 #include <svx/AccessibleShape.hxx>
 #include <comphelper/accessibleeventnotifier.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 2995cc192c3a..35c7ad7f1fce 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCCONTEXT_HXX
 #define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCCONTEXT_HXX
 
-#include <accframe.hxx>
+#include "accframe.hxx"
 #include <accmap.hxx>
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 9955017d7ae7..9e4b1b600feb 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -31,7 +31,7 @@
 #include <viewsh.hxx>
 #include <doc.hxx>
 #include <accmap.hxx>
-#include <accdoc.hxx>
+#include "accdoc.hxx"
 #include "strings.hrc"
 #include <pagefrm.hxx>
 
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index 9b1f2eae5963..d8a281e0bcda 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 #include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
 #include <com/sun/star/accessibility/XAccessibleGetAccFlowTo.hpp>
-#include <accselectionhelper.hxx>
+#include "accselectionhelper.hxx"
 
 class VclSimpleEvent;
 
diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx
index 729cb7f5310f..30a42d0f2452 100644
--- a/sw/source/core/access/accfootnote.hxx
+++ b/sw/source/core/access/accfootnote.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFOOTNOTE_HXX
 
 #include <sal/types.h>
-#include <acccontext.hxx>
+#include "acccontext.hxx"
 
 class SwAccessibleMap;
 class SwFootnoteFrame;
diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx
index a9cb2f0a6e04..5f95c9163d28 100644
--- a/sw/source/core/access/accframe.cxx
+++ b/sw/source/core/access/accframe.cxx
@@ -34,9 +34,9 @@
 #include <fldbas.hxx>
 #include <dcontact.hxx>
 #include <accmap.hxx>
-#include <accfrmobjslist.hxx>
-#include <accfrmobjmap.hxx>
-#include <accframe.hxx>
+#include "accfrmobjslist.hxx"
+#include "accfrmobjmap.hxx"
+#include "accframe.hxx"
 
 using namespace sw::access;
 
diff --git a/sw/source/core/access/accframe.hxx b/sw/source/core/access/accframe.hxx
index 8a97124b5413..547eb08e9992 100644
--- a/sw/source/core/access/accframe.hxx
+++ b/sw/source/core/access/accframe.hxx
@@ -26,7 +26,7 @@
 #include <rtl/ustring.hxx>
 
 #include <list>
-#include <accfrmobj.hxx>
+#include "accfrmobj.hxx"
 
 class SwAccessibleMap;
 class SwFrame;
diff --git a/sw/source/core/access/accframebase.hxx b/sw/source/core/access/accframebase.hxx
index d8e26442171c..286dafe315aa 100644
--- a/sw/source/core/access/accframebase.hxx
+++ b/sw/source/core/access/accframebase.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRAMEBASE_HXX
 #define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRAMEBASE_HXX
 
-#include <acccontext.hxx>
+#include "acccontext.hxx"
 #include <calbck.hxx>
 #include <pam.hxx>
 
diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx
index d5c86979364e..c6475523de75 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <accfrmobj.hxx>
+#include "accfrmobj.hxx"
 
 #include <accmap.hxx>
-#include <acccontext.hxx>
+#include "acccontext.hxx"
 
 #include <viewsh.hxx>
 #include <rootfrm.hxx>
diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx
index 18bdd32421f3..9b43951c868a 100644
--- a/sw/source/core/access/accfrmobjmap.cxx
+++ b/sw/source/core/access/accfrmobjmap.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <accfrmobjmap.hxx>
-#include <accframe.hxx>
+#include "accfrmobjmap.hxx"
+#include "accframe.hxx"
 #include <accmap.hxx>
-#include <acccontext.hxx>
+#include "acccontext.hxx"
 
 #include <viewsh.hxx>
 #include <doc.hxx>
diff --git a/sw/source/core/access/accfrmobjmap.hxx b/sw/source/core/access/accfrmobjmap.hxx
index 2376bde34175..154554f52f6a 100644
--- a/sw/source/core/access/accfrmobjmap.hxx
+++ b/sw/source/core/access/accfrmobjmap.hxx
@@ -22,7 +22,7 @@
 
 #include <tools/gen.hxx>
 #include <svx/svdtypes.hxx>
-#include <accfrmobj.hxx>
+#include "accfrmobj.hxx"
 #include <map>
 
 class SwAccessibleMap;
diff --git a/sw/source/core/access/accfrmobjslist.cxx b/sw/source/core/access/accfrmobjslist.cxx
index 5741b41f8b2b..7eca43a7b873 100644
--- a/sw/source/core/access/accfrmobjslist.cxx
+++ b/sw/source/core/access/accfrmobjslist.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <accfrmobjslist.hxx>
+#include "accfrmobjslist.hxx"
 #include <accmap.hxx>
-#include <acccontext.hxx>
+#include "acccontext.hxx"
 
 #include <pagefrm.hxx>
 #include <sortedobjs.hxx>
diff --git a/sw/source/core/access/accfrmobjslist.hxx b/sw/source/core/access/accfrmobjslist.hxx
index d92adf9eee1a..b6ce5aa512ba 100644
--- a/sw/source/core/access/accfrmobjslist.hxx
+++ b/sw/source/core/access/accfrmobjslist.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRMOBJSLIST_HXX
 #define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRMOBJSLIST_HXX
 
-#include <accfrmobj.hxx>
+#include "accfrmobj.hxx"
 #include <swrect.hxx>
 
 class SwAccessibleMap;
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index 7dc0d1acb866..9b79637d8ff7 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -26,8 +26,8 @@
 #include <vcl/svapp.hxx>
 #include <ndtxt.hxx>
 #include <txtinet.hxx>
-#include <accpara.hxx>
-#include <acchyperlink.hxx>
+#include "accpara.hxx"
+#include "acchyperlink.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
diff --git a/sw/source/core/access/acchypertextdata.cxx b/sw/source/core/access/acchypertextdata.cxx
index d77bca8f57de..c62465d129b9 100644
--- a/sw/source/core/access/acchypertextdata.cxx
+++ b/sw/source/core/access/acchypertextdata.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <acchyperlink.hxx>
-#include <acchypertextdata.hxx>
+#include "acchyperlink.hxx"
+#include "acchypertextdata.hxx"
 
 using namespace ::com::sun::star::accessibility;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 9e69ee7cf077..cb065f10577d 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -28,19 +28,19 @@
 #include <list>
 #include <vector>
 #include <accmap.hxx>
-#include <acccontext.hxx>
-#include <accdoc.hxx>
+#include "acccontext.hxx"
+#include "accdoc.hxx"
 #include <strings.hrc>
-#include <accpreview.hxx>
-#include <accpage.hxx>
-#include <accpara.hxx>
-#include <accheaderfooter.hxx>
-#include <accfootnote.hxx>
-#include <acctextframe.hxx>
-#include <accgraphic.hxx>
-#include <accembedded.hxx>
-#include <acccell.hxx>
-#include <acctable.hxx>
+#include "accpreview.hxx"
+#include "accpage.hxx"
+#include "accpara.hxx"
+#include "accheaderfooter.hxx"
+#include "accfootnote.hxx"
+#include "acctextframe.hxx"
+#include "accgraphic.hxx"
+#include "accembedded.hxx"
+#include "acccell.hxx"
+#include "acctable.hxx"
 #include <fesh.hxx>
 #include <rootfrm.hxx>
 #include <txtfrm.hxx>
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index 07cb5578e745..82094da0afbf 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -27,7 +27,7 @@
 #include <hints.hxx>
 #include "accnotextframe.hxx"
 #include <fmturl.hxx>
-#include <accnotexthyperlink.hxx>
+#include "accnotexthyperlink.hxx"
 #include <svtools/imap.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
diff --git a/sw/source/core/access/accnotexthyperlink.cxx b/sw/source/core/access/accnotexthyperlink.cxx
index 491c76c6d062..a4555ee877bb 100644
--- a/sw/source/core/access/accnotexthyperlink.cxx
+++ b/sw/source/core/access/accnotexthyperlink.cxx
@@ -23,7 +23,7 @@
 #include <txtinet.hxx>
 #include <frmfmt.hxx>
 
-#include <accnotexthyperlink.hxx>
+#include "accnotexthyperlink.hxx"
 
 #include <fmturl.hxx>
 
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 73d1b437e4d6..113ae1c23d7d 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -41,9 +41,9 @@
 #include <com/sun/star/i18n/WordType.hpp>
 #include <com/sun/star/beans/UnknownPropertyException.hpp>
 #include <breakit.hxx>
-#include <accpara.hxx>
+#include "accpara.hxx"
 #include <strings.hrc>
-#include <accportions.hxx>
+#include "accportions.hxx"
 #include <sfx2/viewsh.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
@@ -53,8 +53,8 @@
 #include <doc.hxx>
 #include <IDocumentRedlineAccess.hxx>
 #include <txtatr.hxx>
-#include <acchyperlink.hxx>
-#include <acchypertextdata.hxx>
+#include "acchyperlink.hxx"
+#include "acchypertextdata.hxx"
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #include <section.hxx>
@@ -81,8 +81,8 @@
 #include <unoprnms.hxx>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <viewimp.hxx>
-#include <textmarkuphelper.hxx>
-#include <parachangetrackinginfo.hxx>
+#include "textmarkuphelper.hxx"
+#include "parachangetrackinginfo.hxx"
 #include <com/sun/star/text/TextMarkupType.hpp>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 7a726822ebfc..cd462cedda57 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCPARA_HXX
 #define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCPARA_HXX
 
-#include <acccontext.hxx>
+#include "acccontext.hxx"
 #include <com/sun/star/accessibility/XAccessibleEditableText.hpp>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 #include <com/sun/star/accessibility/XAccessibleHypertext.hpp>
@@ -29,7 +29,7 @@
 #include <txmsrt.hxx>
 #include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
 #include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
-#include <accselectionhelper.hxx>
+#include "accselectionhelper.hxx"
 #include <calbck.hxx>
 #include <unordered_map>
 
diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx
index a3d74f730831..244e7ca0aed7 100644
--- a/sw/source/core/access/accpreview.cxx
+++ b/sw/source/core/access/accpreview.cxx
@@ -22,7 +22,7 @@
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include "strings.hrc"
-#include <accpreview.hxx>
+#include "accpreview.hxx"
 
 const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleDocumentPageView";
 
diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx
index 0781b7b04ed2..ede10d69ef32 100644
--- a/sw/source/core/access/accselectionhelper.cxx
+++ b/sw/source/core/access/accselectionhelper.cxx
@@ -18,9 +18,9 @@
  */
 
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <accselectionhelper.hxx>
+#include "accselectionhelper.hxx"
 
-#include <acccontext.hxx>
+#include "acccontext.hxx"
 #include <accmap.hxx>
 #include <svx/AccessibleShape.hxx>
 #include <viewsh.hxx>
diff --git a/sw/source/core/access/accselectionhelper.hxx b/sw/source/core/access/accselectionhelper.hxx
index 497c071f02fe..52c2e77dcbe8 100644
--- a/sw/source/core/access/accselectionhelper.hxx
+++ b/sw/source/core/access/accselectionhelper.hxx
@@ -20,10 +20,13 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCSELECTIONHELPER_HXX
 #define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCSELECTIONHELPER_HXX
 
+#include <sal/types.h>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+
 class SwAccessibleContext;
 class SwFEShell;
 
-
 class SwAccessibleSelectionHelper
 {
     /// the context on which this helper works
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 9b37eed98294..e03047a9a81e 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -38,10 +38,10 @@
 #include <viscrs.hxx>
 #include <hints.hxx>
 #include <fesh.hxx>
-#include <accfrmobjslist.hxx>
+#include "accfrmobjslist.hxx"
 #include <accmap.hxx>
 #include <strings.hrc>
-#include <acctable.hxx>
+#include "acctable.hxx"
 
 #include <layfrm.hxx>
 #include <com/sun/star/accessibility/XAccessibleText.hpp>
diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx
index 6f03d6a4bc38..4ddca1d15a0c 100644
--- a/sw/source/core/access/acctable.hxx
+++ b/sw/source/core/access/acctable.hxx
@@ -25,7 +25,7 @@
 #include <vector>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 
-#include <acccontext.hxx>
+#include "acccontext.hxx"
 
 class SwTabFrame;
 class SwAccessibleTableData_Impl;
diff --git a/sw/source/core/access/parachangetrackinginfo.cxx b/sw/source/core/access/parachangetrackinginfo.cxx
index 0b2f8888b85f..4939ec6f23b3 100644
--- a/sw/source/core/access/parachangetrackinginfo.cxx
+++ b/sw/source/core/access/parachangetrackinginfo.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <parachangetrackinginfo.hxx>
+#include "parachangetrackinginfo.hxx"
 
 #include <wrong.hxx>
 #include <com/sun/star/text/TextMarkupType.hpp>
diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx
index 4372df0ab1fb..594045173f87 100644
--- a/sw/source/core/access/textmarkuphelper.cxx
+++ b/sw/source/core/access/textmarkuphelper.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <textmarkuphelper.hxx>
-#include <accportions.hxx>
+#include "textmarkuphelper.hxx"
+#include "accportions.hxx"
 
 #include <vector>
 #include <algorithm>
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index fc09bb9c312c..c727ecd90287 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -23,7 +23,7 @@
 #include <txatbase.hxx>
 #include <frmatr.hxx>
 #include <viscrs.hxx>
-#include <callnk.hxx>
+#include "callnk.hxx"
 #include <crsrsh.hxx>
 #include <doc.hxx>
 #include <frmfmt.hxx>
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index c21719a27409..8b54f8806398 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -43,7 +43,7 @@
 #include <txtfrm.hxx>
 #include <sectfrm.hxx>
 #include <swtable.hxx>
-#include <callnk.hxx>
+#include "callnk.hxx"
 #include <viscrs.hxx>
 #include <section.hxx>
 #include <docsh.hxx>
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index e4ae81d5b71d..b1bb87e7f8e1 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -49,7 +49,7 @@
 #include <frmfmt.hxx>
 #include <flyfrm.hxx>
 #include <viscrs.hxx>
-#include <callnk.hxx>
+#include "callnk.hxx"
 #include <doctxm.hxx>
 #include <docfld.hxx>
 #include <expfld.hxx>
diff --git a/sw/source/core/crsr/crstrvl1.cxx b/sw/source/core/crsr/crstrvl1.cxx
index 1ac7374d12db..87844660d3ef 100644
--- a/sw/source/core/crsr/crstrvl1.cxx
+++ b/sw/source/core/crsr/crstrvl1.cxx
@@ -19,7 +19,6 @@
 
 #include <crsrsh.hxx>
 #include <viscrs.hxx>
-#include <callnk.hxx>
 
 bool SwCursorShell::IsStartWord( sal_Int16 nWordType ) const
 {
diff --git a/sw/source/core/crsr/overlayrangesoutline.cxx b/sw/source/core/crsr/overlayrangesoutline.cxx
index 1e025e7e8a5a..3671f209483f 100644
--- a/sw/source/core/crsr/overlayrangesoutline.cxx
+++ b/sw/source/core/crsr/overlayrangesoutline.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <overlayrangesoutline.hxx>
+#include "overlayrangesoutline.hxx"
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
diff --git a/sw/source/core/crsr/trvlcol.cxx b/sw/source/core/crsr/trvlcol.cxx
index f309ea1ea89c..a62c6ebb37e5 100644
--- a/sw/source/core/crsr/trvlcol.cxx
+++ b/sw/source/core/crsr/trvlcol.cxx
@@ -23,7 +23,7 @@
 #include <cntfrm.hxx>
 #include <swcrsr.hxx>
 #include <viscrs.hxx>
-#include <callnk.hxx>
+#include "callnk.hxx"
 
 SwLayoutFrame* GetCurrColumn( const SwLayoutFrame* pLayFrame )
 {
diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx
index 4df1c3e6aa71..05685aae6a33 100644
--- a/sw/source/core/crsr/trvlfnfl.cxx
+++ b/sw/source/core/crsr/trvlfnfl.cxx
@@ -33,7 +33,7 @@
 #include <txtftn.hxx>
 #include <ftnidx.hxx>
 #include <viscrs.hxx>
-#include <callnk.hxx>
+#include "callnk.hxx"
 
 bool SwCursorShell::CallCursorFN( FNCursor fnCursor )
 {
diff --git a/sw/source/core/crsr/trvlreg.cxx b/sw/source/core/crsr/trvlreg.cxx
index 447eef2cc6be..39993f7323dd 100644
--- a/sw/source/core/crsr/trvlreg.cxx
+++ b/sw/source/core/crsr/trvlreg.cxx
@@ -23,7 +23,7 @@
 #include <docary.hxx>
 #include <fmtcntnt.hxx>
 #include <viscrs.hxx>
-#include <callnk.hxx>
+#include "callnk.hxx"
 #include <pamtyp.hxx>
 #include <section.hxx>
 
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index fef5a4f4a78d..da0945f54a4d 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -30,7 +30,7 @@
 #include <frmatr.hxx>
 #include <frmfmt.hxx>
 #include <viscrs.hxx>
-#include <callnk.hxx>
+#include "callnk.hxx"
 #include <tabfrm.hxx>
 #include <ndtxt.hxx>
 #include <shellres.hxx>
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index c23a92912bfa..3781029ff74f 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -49,7 +49,7 @@
 #include <svx/srchdlg.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/sdr/overlay/overlayselection.hxx>
-#include <overlayrangesoutline.hxx>
+#include "overlayrangesoutline.hxx"
 
 #include <memory>
 #include <boost/property_tree/json_parser.hpp>
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index d414b920aef0..24ad79bd6210 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -77,7 +77,7 @@
 #include <laycache.hxx>
 #include <mvsave.hxx>
 #include <istyleaccess.hxx>
-#include <swstylemanager.hxx>
+#include "swstylemanager.hxx"
 #include <IGrammarContact.hxx>
 #include <tblafmt.hxx>
 #include <tblsel.hxx>
diff --git a/sw/source/core/docnode/cancellablejob.cxx b/sw/source/core/docnode/cancellablejob.cxx
index 2326ba479e36..eecd1d33683d 100644
--- a/sw/source/core/docnode/cancellablejob.cxx
+++ b/sw/source/core/docnode/cancellablejob.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <cancellablejob.hxx>
+#include "cancellablejob.hxx"
 #include <observablethread.hxx>
 
 CancellableJob::CancellableJob( const rtl::Reference< ObservableThread >& rThread ) :
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 211c30e76838..9b72c028dbbe 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -55,7 +55,7 @@
 #include <viewsh.hxx>
 #include <txtfrm.hxx>
 #include <memory>
-#include <ndsect.hxx>
+#include "ndsect.hxx"
 #include <tools/datetimeutils.hxx>
 
 // #i21457# - new implementation of local method <lcl_IsInSameTableBox(..)>.
diff --git a/sw/source/core/docnode/ndsect.hxx b/sw/source/core/docnode/ndsect.hxx
index 19c3eadbfe2c..70e3ed72f695 100644
--- a/sw/source/core/docnode/ndsect.hxx
+++ b/sw/source/core/docnode/ndsect.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_DOCNODE_NDSECT_HXX
 #define INCLUDED_SW_SOURCE_CORE_DOCNODE_NDSECT_HXX
 
+#include <tools/solar.h>
+
+class SwSectionNode;
+
 void sw_DeleteFootnote( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd );
 
 
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index b074a6a38bf1..43292450c704 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -63,7 +63,7 @@
 #include <unosection.hxx>
 #include <calbck.hxx>
 #include <algorithm>
-#include <ndsect.hxx>
+#include "ndsect.hxx"
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/inc/docedt.hxx b/sw/source/core/inc/docedt.hxx
index 6d88abb37cbd..13ba7c8a8467 100644
--- a/sw/source/core/inc/docedt.hxx
+++ b/sw/source/core/inc/docedt.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_DOCEDT_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_DOCEDT_HXX
 
+class SwPaM;
+
 bool sw_JoinText( SwPaM& rPam, bool bJoinPrev );
 
 void sw_GetJoinFlags( SwPaM& rPam, bool& rJoinText, bool& rJoinPrev );
diff --git a/sw/source/core/inc/docredln.hxx b/sw/source/core/inc/docredln.hxx
index e1b4f792b522..1a65c354054a 100644
--- a/sw/source/core/inc/docredln.hxx
+++ b/sw/source/core/inc/docredln.hxx
@@ -24,6 +24,8 @@
 
 #if defined DBG_UTIL
 
+class SwDoc;
+
 void sw_DebugRedline( const SwDoc* pDoc );
 
 #endif
diff --git a/sw/source/core/inc/fefly.hxx b/sw/source/core/inc/fefly.hxx
index b030b47f16af..07b56d5fcbcb 100644
--- a/sw/source/core/inc/fefly.hxx
+++ b/sw/source/core/inc/fefly.hxx
@@ -20,6 +20,9 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_FEFLY_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_FEFLY_HXX
 
+class SwFlyFrame;
+class SfxItemSet;
+
 bool sw_ChkAndSetNewAnchor( const SwFlyFrame& rFly, SfxItemSet& rSet );
 
 
diff --git a/sw/source/core/inc/fntcap.hxx b/sw/source/core/inc/fntcap.hxx
index fe1a564c5996..4fd0290ffce3 100644
--- a/sw/source/core/inc/fntcap.hxx
+++ b/sw/source/core/inc/fntcap.hxx
@@ -20,6 +20,11 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_FNTCAP_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_FNTCAP_HXX
 
+#include <sal/types.h>
+#include <rtl/ustring.hxx>
+
+class SwFont;
+
 sal_Int32 sw_CalcCaseMap( const SwFont& rFnt,
                           const OUString& rOrigString,
                           sal_Int32 nOfst,
diff --git a/sw/source/core/inc/paintfrm.hxx b/sw/source/core/inc/paintfrm.hxx
index ec05b04901db..6f30539e6ffe 100644
--- a/sw/source/core/inc/paintfrm.hxx
+++ b/sw/source/core/inc/paintfrm.hxx
@@ -20,8 +20,12 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_PAINTFRM_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_PAINTFRM_HXX
 
+#include <tools/color.hxx>
+
 extern Color aGlobalRetoucheColor;
 
+class OutputDevice;
+
 void SwCalcPixStatics( OutputDevice const *pOut );
 
 #endif // INCLUDED_SW_SOURCE_CORE_INC_PAINTFRM_HXX
diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx
index df715a8b1c4b..84c29e08ee9f 100644
--- a/sw/source/core/inc/threadmanager.hxx
+++ b/sw/source/core/inc/threadmanager.hxx
@@ -29,7 +29,7 @@
 #include <cppuhelper/weak.hxx>
 #include <com/sun/star/util/XJobManager.hpp>
 #include <observablethread.hxx>
-#include <cancellablejob.hxx>
+#include "cancellablejob.hxx"
 #include <threadlistener.hxx>
 
 #include <memory>
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 1500b96d110b..dad4f15c13cf 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -41,7 +41,7 @@
 #include <dcontact.hxx>
 #include <sortedobjs.hxx>
 #include <layouter.hxx>
-#include <objectformattertxtfrm.hxx>
+#include "objectformattertxtfrm.hxx"
 #include <HandleAnchorNodeChg.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 44cee9648ad9..359c7c680692 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -54,7 +54,7 @@
 #include "node2lay.hxx"
 #include "ndole.hxx"
 #include "hints.hxx"
-#include <layhelp.hxx>
+#include "layhelp.hxx"
 #include <laycache.hxx>
 #include <rootfrm.hxx>
 #include <paratr.hxx>
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index 21ab1ba8729e..e417698fb0e5 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -25,7 +25,7 @@
 #include <docary.hxx>
 #include <fmtpdsc.hxx>
 #include <laycache.hxx>
-#include <layhelp.hxx>
+#include "layhelp.hxx"
 #include <pagefrm.hxx>
 #include <rootfrm.hxx>
 #include <txtfrm.hxx>
diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx
index 4723475526db..ec0a1d2e8d77 100644
--- a/sw/source/core/layout/layouter.cxx
+++ b/sw/source/core/layout/layouter.cxx
@@ -27,7 +27,7 @@
 #include <IDocumentLayoutAccess.hxx>
 
 #include <movedfwdfrmsbyobjpos.hxx>
-#include <objstmpconsiderwrapinfl.hxx>
+#include "objstmpconsiderwrapinfl.hxx"
 
 #define LOOP_DETECT 250
 
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 6673ed22b909..51e25db4f792 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -26,7 +26,7 @@
 #include <pagefrm.hxx>
 #include <dflyobj.hxx>
 #include <frmtool.hxx>
-#include <virtoutp.hxx>
+#include "virtoutp.hxx"
 #include <blink.hxx>
 #include <sectfrm.hxx>
 #include <notxtfrm.hxx>
diff --git a/sw/source/core/layout/objectformatter.cxx b/sw/source/core/layout/objectformatter.cxx
index 0818b897ac49..357a261aea5c 100644
--- a/sw/source/core/layout/objectformatter.cxx
+++ b/sw/source/core/layout/objectformatter.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <objectformattertxtfrm.hxx>
-#include <objectformatterlayfrm.hxx>
+#include "objectformattertxtfrm.hxx"
+#include "objectformatterlayfrm.hxx"
 #include <anchoreddrawobject.hxx>
 #include <sortedobjs.hxx>
 #include <rootfrm.hxx>
diff --git a/sw/source/core/layout/objectformatterlayfrm.cxx b/sw/source/core/layout/objectformatterlayfrm.cxx
index 60507497a1f1..4c5516c90c48 100644
--- a/sw/source/core/layout/objectformatterlayfrm.cxx
+++ b/sw/source/core/layout/objectformatterlayfrm.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <objectformatterlayfrm.hxx>
+#include "objectformatterlayfrm.hxx"
 #include <anchoredobject.hxx>
 #include <sortedobjs.hxx>
 #include <pagefrm.hxx>
diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx
index 58ce8914da1c..63326578686b 100644
--- a/sw/source/core/layout/objectformattertxtfrm.cxx
+++ b/sw/source/core/layout/objectformattertxtfrm.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <objectformattertxtfrm.hxx>
+#include "objectformattertxtfrm.hxx"
 #include <sortedobjs.hxx>
 #include <rootfrm.hxx>
 #include <flyfrms.hxx>
diff --git a/sw/source/core/layout/objstmpconsiderwrapinfl.cxx b/sw/source/core/layout/objstmpconsiderwrapinfl.cxx
index a3396e6f5671..01aa4d38a501 100644
--- a/sw/source/core/layout/objstmpconsiderwrapinfl.cxx
+++ b/sw/source/core/layout/objstmpconsiderwrapinfl.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <objstmpconsiderwrapinfl.hxx>
+#include "objstmpconsiderwrapinfl.hxx"
 #include <anchoredobject.hxx>
 
 SwObjsMarkedAsTmpConsiderWrapInfluence::SwObjsMarkedAsTmpConsiderWrapInfluence()
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 4ea7dc6c4644..e4feaa131026 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -52,7 +52,7 @@
 #include <pagedesc.hxx>
 #include <ptqueue.hxx>
 #include <noteurl.hxx>
-#include <virtoutp.hxx>
+#include "virtoutp.hxx"
 #include <lineinfo.hxx>
 #include <dbg_lay.hxx>
 #include <docsh.hxx>
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index dfb2e0ffbcaf..530f79163453 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -64,9 +64,9 @@
 #include <sectfrm.hxx>
 #include <flyfrm.hxx>
 #include <notxtfrm.hxx>
-#include <porfld.hxx>
+#include "porfld.hxx"
 #include <SwStyleNameMapper.hxx>
-#include <itrpaint.hxx>
+#include "itrpaint.hxx"
 #include <i18nlangtag/languagetag.hxx>
 #include <IMark.hxx>
 #include <printdata.hxx>
diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx
index cb257da198e7..9a6ee165323c 100644
--- a/sw/source/core/text/atrstck.cxx
+++ b/sw/source/core/text/atrstck.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <atrhndl.hxx>
+#include "atrhndl.hxx"
 #include <svl/itemiter.hxx>
 #include <vcl/outdev.hxx>
 #include <editeng/cmapitem.hxx>
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index dd448aab7b9f..28c3d20499d2 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -31,7 +31,7 @@
 #include <editeng/tstpitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/lspcitem.hxx>
-#include <pormulti.hxx>
+#include "pormulti.hxx"
 #include <doc.hxx>
 #include <IDocumentDeviceAccess.hxx>
 #include <sortedobjs.hxx>
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 4064466227dc..4553b8593128 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -38,18 +38,18 @@
 #include <pam.hxx>
 #include <flyfrms.hxx>
 #include <fmtanchr.hxx>
-#include <itrform2.hxx>
-#include <widorp.hxx>
-#include <txtcache.hxx>
-#include <porrst.hxx>
+#include "itrform2.hxx"
+#include "widorp.hxx"
+#include "txtcache.hxx"
+#include "porrst.hxx"
 #include <blink.hxx>
-#include <porfld.hxx>
+#include "porfld.hxx"
 #include <sectfrm.hxx>
-#include <pormulti.hxx>
+#include "pormulti.hxx"
 #include <rootfrm.hxx>
 #include <frmfmt.hxx>
 #include <sortedobjs.hxx>
-#include <portab.hxx>
+#include "portab.hxx"
 #include <editeng/lrspitem.hxx>
 #include <editeng/tstpitem.hxx>
 
diff --git a/sw/source/core/text/frminf.cxx b/sw/source/core/text/frminf.cxx
index ed500ceafed6..50f35188d845 100644
--- a/sw/source/core/text/frminf.cxx
+++ b/sw/source/core/text/frminf.cxx
@@ -19,7 +19,7 @@
 
 #include <pam.hxx>
 #include <frminf.hxx>
-#include <itrtxt.hxx>
+#include "itrtxt.hxx"
 
 sal_Int32 SwTextMargin::GetTextStart() const
 {
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index cb658e54b0cc..25531270642d 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -36,11 +36,11 @@
 #include <viewopt.hxx>
 #include <frmtool.hxx>
 #include <txtfrm.hxx>
-#include <itrpaint.hxx>
-#include <txtpaint.hxx>
-#include <txtcache.hxx>
+#include "itrpaint.hxx"
+#include "txtpaint.hxx"
+#include "txtcache.hxx"
 #include <flyfrm.hxx>
-#include <redlnitr.hxx>
+#include "redlnitr.hxx"
 #include <swmodule.hxx>
 #include <tabfrm.hxx>
 #include <numrule.hxx>
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index ca432b1b5f68..bcbdf0650a33 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -21,15 +21,15 @@
 #include <dlelstnr.hxx>
 #include <swmodule.hxx>
 #include <IDocumentSettingAccess.hxx>
-#include <guess.hxx>
-#include <inftxt.hxx>
+#include "guess.hxx"
+#include "inftxt.hxx"
 #include <pagefrm.hxx>
 #include <pagedesc.hxx>
 #include <tgrditem.hxx>
 #include <com/sun/star/i18n/BreakType.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
 #include <unotools/charclass.hxx>
-#include <porfld.hxx>
+#include "porfld.hxx"
 #include <paratr.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 6a0fccff0ae7..f69df5dd0402 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -50,12 +50,12 @@
 #include <IDocumentDeviceAccess.hxx>
 #include <paratr.hxx>
 #include <rootfrm.hxx>
-#include <inftxt.hxx>
+#include "inftxt.hxx"
 #include <blink.hxx>
 #include <noteurl.hxx>
-#include <porftn.hxx>
-#include <porrst.hxx>
-#include <itratr.hxx>
+#include "porftn.hxx"
+#include "porrst.hxx"
+#include "itratr.hxx"
 #include <accessibilityoptions.hxx>
 #include <wrong.hxx>
 #include <doc.hxx>
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index 08c6938028b3..aab6cb7be73a 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -28,7 +28,7 @@
 #include "porfly.hxx"
 #include "pordrop.hxx"
 #include "pormulti.hxx"
-#include <portab.hxx>
+#include "portab.hxx"
 #include <memory>
 
 #define MIN_TAB_WIDTH 60
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 270ef8a2a82d..12ac9a1e3503 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -44,12 +44,12 @@
 #include <dcontact.hxx>
 #include <fldbas.hxx>
 #include <pam.hxx>
-#include <itratr.hxx>
+#include "itratr.hxx"
 #include <htmltbl.hxx>
 #include <swtable.hxx>
-#include <redlnitr.hxx>
+#include "redlnitr.hxx"
 #include <fmtsrnd.hxx>
-#include <itrtxt.hxx>
+#include "itrtxt.hxx"
 #include <breakit.hxx>
 #include <com/sun/star/i18n/WordType.hpp>
 #include <editeng/lrspitem.hxx>
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx
index 07ab43d5af2c..d36eece7b3d5 100644
--- a/sw/source/core/text/itratr.hxx
+++ b/sw/source/core/text/itratr.hxx
@@ -18,7 +18,7 @@
  */
 #ifndef INCLUDED_SW_SOURCE_CORE_TEXT_ITRATR_HXX
 #define INCLUDED_SW_SOURCE_CORE_TEXT_ITRATR_HXX
-#include <atrhndl.hxx>
+#include "atrhndl.hxx"
 
 #include "swtypes.hxx"
 #include "swfont.hxx"
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index cfe12197735f..73a4d35e9ed4 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -44,7 +44,7 @@
 #include "porfly.hxx"
 #include "pordrop.hxx"
 #include "crstate.hxx"
-#include <pormulti.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 f877a969e7e2..285a35410f81 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -35,25 +35,25 @@
 #include <viewsh.hxx>
 #include <viewopt.hxx>
 #include <paratr.hxx>
-#include <itrform2.hxx>
-#include <porrst.hxx>
-#include <portab.hxx>
-#include <porfly.hxx>
-#include <portox.hxx>
-#include <porref.hxx>
-#include <porfld.hxx>
-#include <porftn.hxx>
-#include <porhyph.hxx>
-#include <pordrop.hxx>
-#include <guess.hxx>
+#include "itrform2.hxx"
+#include "porrst.hxx"
+#include "portab.hxx"
+#include "porfly.hxx"
+#include "portox.hxx"
+#include "porref.hxx"
+#include "porfld.hxx"
+#include "porftn.hxx"
+#include "porhyph.hxx"
+#include "pordrop.hxx"
+#include "guess.hxx"
 #include <blink.hxx>
 #include <ftnfrm.hxx>
-#include <redlnitr.hxx>
+#include "redlnitr.hxx"
 #include <pagefrm.hxx>
 #include <pagedesc.hxx>
 #include <tgrditem.hxx>
 #include <doc.hxx>
-#include <pormulti.hxx>
+#include "pormulti.hxx"
 #include <unotools/charclass.hxx>
 #include <xmloff/odffields.hxx>
 #include <IDocumentSettingAccess.hxx>
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index 8a09ded09c92..de2f8f6a6546 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -27,7 +27,7 @@
 #include <pagefrm.hxx>
 #include <pagedesc.hxx>
 #include <tgrditem.hxx>
-#include <porfld.hxx>
+#include "porfld.hxx"
 
 #include "itrtxt.hxx"
 #include "txtfrm.hxx"
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index 17e4b7306995..f92dd232035f 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -19,8 +19,8 @@
 
 #include <viewopt.hxx>
 #include <SwPortionHandler.hxx>
-#include <inftxt.hxx>
-#include <porexp.hxx>
+#include "inftxt.hxx"
+#include "porexp.hxx"
 
 sal_Int32 SwExpandPortion::GetCursorOfst( const sal_uInt16 nOfst ) const
 { return SwLinePortion::GetCursorOfst( nOfst ); }
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index e6a8ab110248..ad9d085b1527 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -26,9 +26,9 @@
 #include <vcl/outdev.hxx>
 #include <viewopt.hxx>
 #include <SwPortionHandler.hxx>
-#include <porlay.hxx>
-#include <porfld.hxx>
-#include <inftxt.hxx>
+#include "porlay.hxx"
+#include "porfld.hxx"
+#include "inftxt.hxx"
 #include <blink.hxx>
 #include <frmtool.hxx>
 #include <viewsh.hxx>
@@ -37,8 +37,8 @@
 #include <IDocumentSettingAccess.hxx>
 #include "rootfrm.hxx"
 #include <breakit.hxx>
-#include <porrst.hxx>
-#include <porftn.hxx>
+#include "porrst.hxx"
+#include "porftn.hxx"
 #include <accessibilityoptions.hxx>
 #include <editeng/lrspitem.hxx>
 #include <unicode/ubidi.h>
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index 53b10b50681d..e2a65bacd8ba 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -20,7 +20,7 @@
 #include "dcontact.hxx"
 #include "dflyobj.hxx"
 #include "pam.hxx"
-#include <portab.hxx>
+#include "portab.hxx"
 #include "flyfrm.hxx"
 #include "rootfrm.hxx"
 #include "frmfmt.hxx"
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 3573398d42bf..36fde765769f 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -24,9 +24,9 @@
 #include "blink.hxx"
 #include "redlnitr.hxx"
 #include "porfly.hxx"
-#include <porrst.hxx>
-#include <pormulti.hxx>
-#include <pordrop.hxx>
+#include "porrst.hxx"
+#include "pormulti.hxx"
+#include "pordrop.hxx"
 #include <breakit.hxx>
 #include <unicode/uchar.h>
 #include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 42fba70e6769..5134593156f3 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -35,13 +35,13 @@
 #include <fchrfmt.hxx>
 #include <layfrm.hxx>
 #include <SwPortionHandler.hxx>
-#include <pormulti.hxx>
-#include <inftxt.hxx>
-#include <itrpaint.hxx>
+#include "pormulti.hxx"
+#include "inftxt.hxx"
+#include "itrpaint.hxx"
 #include <viewopt.hxx>
-#include <itrform2.hxx>
-#include <porfld.hxx>
-#include <porglue.hxx>
+#include "itrform2.hxx"
+#include "porfld.hxx"
+#include "porglue.hxx"
 #include <breakit.hxx>
 #include <pagefrm.hxx>
 #include <rowfrm.hxx>
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index c40d9cff79c5..2dd07c5efb47 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -32,16 +32,16 @@
 #include <pagefrm.hxx>
 #include <paratr.hxx>
 #include <SwPortionHandler.hxx>
-#include <porrst.hxx>
-#include <inftxt.hxx>
-#include <txtpaint.hxx>
+#include "porrst.hxx"
+#include "inftxt.hxx"
+#include "txtpaint.hxx"
 #include <swfntcch.hxx>
 #include <tgrditem.hxx>
 #include <pagedesc.hxx>
 #include <frmatr.hxx>
-#include <redlnitr.hxx>
-#include <porfly.hxx>
-#include <atrhndl.hxx>
+#include "redlnitr.hxx"
+#include "porfly.hxx"
+#include "atrhndl.hxx"
 #include "rootfrm.hxx"
 
 #include <IDocumentRedlineAccess.hxx>
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 4b7947114d7d..d541607b64a0 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -22,12 +22,12 @@
 #include <hintids.hxx>
 #include <EnhancedPDFExportHelper.hxx>
 #include <SwPortionHandler.hxx>
-#include <porlay.hxx>
-#include <inftxt.hxx>
-#include <guess.hxx>
-#include <porglue.hxx>
-#include <portab.hxx>
-#include <porfld.hxx>
+#include "porlay.hxx"
+#include "inftxt.hxx"
+#include "guess.hxx"
+#include "porglue.hxx"
+#include "portab.hxx"
+#include "porfld.hxx"
 #include <pagefrm.hxx>
 #include <tgrditem.hxx>
 #include <wrong.hxx>
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index a7d8427e81c4..808e32e341e4 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -25,7 +25,7 @@
 #include <redline.hxx>
 #include <txtatr.hxx>
 #include <docary.hxx>
-#include <itratr.hxx>
+#include "itratr.hxx"
 #include <ndtxt.hxx>
 #include <doc.hxx>
 #include <IDocumentRedlineAccess.hxx>
@@ -37,7 +37,7 @@
 #include <vcl/settings.hxx>
 #include <txtfrm.hxx>
 #include <vcl/svapp.hxx>
-#include <redlnitr.hxx>
+#include "redlnitr.hxx"
 #include <extinput.hxx>
 #include <sfx2/printer.hxx>
 #include <vcl/window.hxx>
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 44f2b44977da..c8e58a1aa0c5 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -26,9 +26,9 @@
 #include <charfmt.hxx>
 #include <viewopt.hxx>
 #include <viewsh.hxx>
-#include <pordrop.hxx>
-#include <itrform2.hxx>
-#include <txtpaint.hxx>
+#include "pordrop.hxx"
+#include "itrform2.hxx"
+#include "txtpaint.hxx"
 #include <blink.hxx>
 #include <breakit.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 1652d5222fbb..4410fe1dcf88 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -46,7 +46,7 @@
 #include "expfld.hxx"
 #include "docufld.hxx"
 #include "pagedesc.hxx"
-#include <pormulti.hxx>
+#include "pormulti.hxx"
 #include "fmtmeta.hxx"
 #include "reffld.hxx"
 #include "flddat.hxx"
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 76e36402977e..dcd0626c92fc 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -59,9 +59,9 @@
 #include <fmtline.hxx>
 #include <txtfrm.hxx>
 #include <sectfrm.hxx>
-#include <itrform2.hxx>
-#include <widorp.hxx>
-#include <txtcache.hxx>
+#include "itrform2.hxx"
+#include "widorp.hxx"
+#include "txtcache.hxx"
 #include <fntcache.hxx>
 #include <SwGrammarMarkUp.hxx>
 #include <lineinfo.hxx>
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index acf4c7fe4fc2..edb3b0ef7d76 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -23,10 +23,10 @@
 #include <viewopt.hxx>
 #include <viewsh.hxx>
 #include <SwPortionHandler.hxx>
-#include <porhyph.hxx>
-#include <inftxt.hxx>
-#include <itrform2.hxx>
-#include <guess.hxx>
+#include "porhyph.hxx"
+#include "inftxt.hxx"
+#include "itrform2.hxx"
+#include "guess.hxx"
 #include <splargs.hxx>
 #include <rootfrm.hxx>
 
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 6d38ae6b193a..cf60c8f1f303 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -32,7 +32,7 @@
 #include "itrform2.hxx"
 #include "txtfrm.hxx"
 #include <numrule.hxx>
-#include <porfld.hxx>
+#include "porfld.hxx"
 #include <memory>
 
 /**
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index b7a40b0d66fb..1d06634c6950 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -28,7 +28,7 @@
 #include <vcl/svapp.hxx>
 #include <svl/zforlist.hxx>
 
-#include <XMLRangeHelper.hxx>
+#include "XMLRangeHelper.hxx"
 #include <unochart.hxx>
 #include <swtable.hxx>
 #include <unoprnms.hxx>
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index abb7cc87753f..3219ebaaa0f1 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -88,7 +88,7 @@
 #include <editeng/unoipset.hxx>
 #include <editeng/unoprnms.hxx>
 #include <svx/xdef.hxx>
-#include <unomapproperties.hxx>
+#include "unomapproperties.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
diff --git a/sw/source/core/unocore/unomap1.cxx b/sw/source/core/unocore/unomap1.cxx
index 4e8e4f00ffff..120b12202857 100644
--- a/sw/source/core/unocore/unomap1.cxx
+++ b/sw/source/core/unocore/unomap1.cxx
@@ -87,7 +87,7 @@
 #include <editeng/unoipset.hxx>
 #include <editeng/unoprnms.hxx>
 #include <svx/xdef.hxx>
-#include <unomapproperties.hxx>
+#include "unomapproperties.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx
index 5d91d91a1c6a..8178fbfb32c8 100644
--- a/sw/source/core/view/viewpg.cxx
+++ b/sw/source/core/view/viewpg.cxx
@@ -40,7 +40,7 @@
 
 #include <IDocumentFieldsAccess.hxx>
 #include <IDocumentDeviceAccess.hxx>
-#include <vprint.hxx>
+#include "vprint.hxx"
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 06163ce864cf..21eb43e9149f 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -69,7 +69,7 @@
 #include <fmtpdsc.hxx>
 #include <globals.hrc>
 #include "PostItMgr.hxx"
-#include <vprint.hxx>
+#include "vprint.hxx"
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/view/vprint.hxx b/sw/source/core/view/vprint.hxx
index c2451acd4ae8..fc8e35c99eef 100644
--- a/sw/source/core/view/vprint.hxx
+++ b/sw/source/core/view/vprint.hxx
@@ -20,6 +20,11 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_VIEW_VPRINT_HXX
 #define INCLUDED_SW_SOURCE_CORE_VIEW_VPRINT_HXX
 
+#include <sal/types.h>
+
+class SwRootFrame;
+class SwPageFrame;
+
 SwPageFrame const* sw_getPage(SwRootFrame const& rLayout, sal_Int32 const nPage);
 
 #endif