24 files changed, 397 insertions, 397 deletions
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index b81513afd987..95fc79d8ed01 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -25,26 +25,26 @@
 #include <svl/stritem.hxx>
 #include <vcl/msgbox.hxx>
 
-#include "arealink.hxx"
-
-#include "tablink.hxx"
-#include "document.hxx"
-#include "docsh.hxx"
-#include "rangenam.hxx"
-#include "dbdata.hxx"
-#include "undoblk.hxx"
-#include "globstr.hrc"
-#include "markdata.hxx"
-#include "hints.hxx"
-#include "filter.hxx"
-
-#include "attrib.hxx"
-#include "patattr.hxx"
-#include "docpool.hxx"
-
-#include "sc.hrc"
-#include "scabstdlg.hxx"
-#include "clipparam.hxx"
+#include <arealink.hxx>
+
+#include <tablink.hxx>
+#include <document.hxx>
+#include <docsh.hxx>
+#include <rangenam.hxx>
+#include <dbdata.hxx>
+#include <undoblk.hxx>
+#include <globstr.hrc>
+#include <markdata.hxx>
+#include <hints.hxx>
+#include <filter.hxx>
+
+#include <attrib.hxx>
+#include <patattr.hxx>
+#include <docpool.hxx>
+
+#include <sc.hrc>
+#include <scabstdlg.hxx>
+#include <clipparam.hxx>
 
 struct AreaLink_Impl
 {
diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx
index bd468cb64ac5..98a104c4f8c3 100644
--- a/sc/source/ui/docshell/autostyl.cxx
+++ b/sc/source/ui/docshell/autostyl.cxx
@@ -19,10 +19,10 @@
 
 #include <time.h>
 
-#include "attrib.hxx"
-#include "autostyl.hxx"
-#include "docsh.hxx"
-#include "sc.hrc"
+#include <attrib.hxx>
+#include <autostyl.hxx>
+#include <docsh.hxx>
+#include <sc.hrc>
 
 static inline sal_uLong TimeNow()          // seconds
 {
diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx
index f99384142ed0..16a6cb09409e 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -27,7 +27,7 @@
 #include <documentlinkmgr.hxx>
 #include <o3tl/enumarray.hxx>
 
-#include "officecfg/Office/Calc.hxx"
+#include <officecfg/Office/Calc.hxx>
 
 
 #if defined(_WIN32)
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index 0bb9aa4fed3b..0d424c08282f 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -24,34 +24,34 @@
 #include <svx/svdpage.hxx>
 #include <com/sun/star/sdb/CommandType.hpp>
 
-#include "dbdocfun.hxx"
-#include "sc.hrc"
-#include "dbdata.hxx"
-#include "undodat.hxx"
-#include "docsh.hxx"
-#include "docfunc.hxx"
-#include "globstr.hrc"
-#include "globalnames.hxx"
-#include "tabvwsh.hxx"
-#include "patattr.hxx"
-#include "rangenam.hxx"
-#include "olinetab.hxx"
-#include "dpobject.hxx"
-#include "dpsave.hxx"
-#include "dociter.hxx"
-#include "editable.hxx"
-#include "attrib.hxx"
-#include "drwlayer.hxx"
-#include "dpshttab.hxx"
-#include "hints.hxx"
-#include "queryentry.hxx"
-#include "markdata.hxx"
-#include "progress.hxx"
+#include <dbdocfun.hxx>
+#include <sc.hrc>
+#include <dbdata.hxx>
+#include <undodat.hxx>
+#include <docsh.hxx>
+#include <docfunc.hxx>
+#include <globstr.hrc>
+#include <globalnames.hxx>
+#include <tabvwsh.hxx>
+#include <patattr.hxx>
+#include <rangenam.hxx>
+#include <olinetab.hxx>
+#include <dpobject.hxx>
+#include <dpsave.hxx>
+#include <dociter.hxx>
+#include <editable.hxx>
+#include <attrib.hxx>
+#include <drwlayer.hxx>
+#include <dpshttab.hxx>
+#include <hints.hxx>
+#include <queryentry.hxx>
+#include <markdata.hxx>
+#include <progress.hxx>
 #include <undosort.hxx>
 #include <inputopt.hxx>
 
-#include "chartlis.hxx"
-#include "ChartTools.hxx"
+#include <chartlis.hxx>
+#include <ChartTools.hxx>
 
 #include <set>
 #include <memory>
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index 8979252bb5d3..6710ed4659fb 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -37,22 +37,22 @@
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 
-#include "dbdocfun.hxx"
-#include "docsh.hxx"
-#include "globstr.hrc"
-#include "scerrors.hxx"
-#include "dbdata.hxx"
-#include "markdata.hxx"
-#include "undodat.hxx"
-#include "progress.hxx"
-#include "patattr.hxx"
-#include "docpool.hxx"
-#include "attrib.hxx"
-#include "dbdocutl.hxx"
-#include "editable.hxx"
-#include "hints.hxx"
-#include "miscuno.hxx"
-#include "chgtrack.hxx"
+#include <dbdocfun.hxx>
+#include <docsh.hxx>
+#include <globstr.hrc>
+#include <scerrors.hxx>
+#include <dbdata.hxx>
+#include <markdata.hxx>
+#include <undodat.hxx>
+#include <progress.hxx>
+#include <patattr.hxx>
+#include <docpool.hxx>
+#include <attrib.hxx>
+#include <dbdocutl.hxx>
+#include <editable.hxx>
+#include <hints.hxx>
+#include <miscuno.hxx>
+#include <chgtrack.hxx>
 #include <refupdatecontext.hxx>
 
 using namespace com::sun::star;
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index dfbc54582c6b..4ffbf7610c50 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "scitems.hxx"
+#include <scitems.hxx>
 
 #include <comphelper/lok.hxx>
 #include <sfx2/app.hxx>
@@ -35,57 +35,57 @@
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
 
-#include "docfunc.hxx"
-
-#include "sc.hrc"
-#include "strings.hrc"
-
-#include "arealink.hxx"
-#include "attrib.hxx"
-#include "dociter.hxx"
-#include "autoform.hxx"
-#include "formulacell.hxx"
-#include "cellmergeoption.hxx"
-#include "detdata.hxx"
-#include "detfunc.hxx"
-#include "docpool.hxx"
-#include "docsh.hxx"
-#include "drwlayer.hxx"
-#include "editutil.hxx"
-#include "globstr.hrc"
-#include "globalnames.hxx"
-#include "olinetab.hxx"
-#include "patattr.hxx"
-#include "rangenam.hxx"
-#include "rangeutl.hxx"
-#include "refundo.hxx"
-#include "scresid.hxx"
-#include "stlpool.hxx"
-#include "stlsheet.hxx"
-#include "tablink.hxx"
-#include "tabvwsh.hxx"
-#include "uiitems.hxx"
-#include "undoblk.hxx"
-#include "undocell.hxx"
-#include "undodraw.hxx"
-#include "undotab.hxx"
-#include "waitoff.hxx"
-#include "sizedev.hxx"
-#include "scmod.hxx"
-#include "inputhdl.hxx"
-#include "inputwin.hxx"
-#include "editable.hxx"
-#include "compiler.hxx"
-#include "scui_def.hxx"
-#include "tabprotection.hxx"
-#include "clipparam.hxx"
-#include "externalrefmgr.hxx"
-#include "undorangename.hxx"
-#include "progress.hxx"
-#include "dpobject.hxx"
-#include "stringutil.hxx"
-#include "cellvalue.hxx"
-#include "tokenarray.hxx"
+#include <docfunc.hxx>
+
+#include <sc.hrc>
+#include <strings.hrc>
+
+#include <arealink.hxx>
+#include <attrib.hxx>
+#include <dociter.hxx>
+#include <autoform.hxx>
+#include <formulacell.hxx>
+#include <cellmergeoption.hxx>
+#include <detdata.hxx>
+#include <detfunc.hxx>
+#include <docpool.hxx>
+#include <docsh.hxx>
+#include <drwlayer.hxx>
+#include <editutil.hxx>
+#include <globstr.hrc>
+#include <globalnames.hxx>
+#include <olinetab.hxx>
+#include <patattr.hxx>
+#include <rangenam.hxx>
+#include <rangeutl.hxx>
+#include <refundo.hxx>
+#include <scresid.hxx>
+#include <stlpool.hxx>
+#include <stlsheet.hxx>
+#include <tablink.hxx>
+#include <tabvwsh.hxx>
+#include <uiitems.hxx>
+#include <undoblk.hxx>
+#include <undocell.hxx>
+#include <undodraw.hxx>
+#include <undotab.hxx>
+#include <waitoff.hxx>
+#include <sizedev.hxx>
+#include <scmod.hxx>
+#include <inputhdl.hxx>
+#include <inputwin.hxx>
+#include <editable.hxx>
+#include <compiler.hxx>
+#include <scui_def.hxx>
+#include <tabprotection.hxx>
+#include <clipparam.hxx>
+#include <externalrefmgr.hxx>
+#include <undorangename.hxx>
+#include <progress.hxx>
+#include <dpobject.hxx>
+#include <stringutil.hxx>
+#include <cellvalue.hxx>
+#include <tokenarray.hxx>
 #include <rowheightcontext.hxx>
 #include <cellvalues.hxx>
 #include <undoconvert.hxx>
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index a4157d0a9ba4..74ef8daf2a2b 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "docsh.hxx"
+#include <docsh.hxx>
 
-#include "scitems.hxx"
+#include <scitems.hxx>
 #include <vcl/errinf.hxx>
 #include <editeng/justifyitem.hxx>
 #include <comphelper/classids.hxx>
@@ -40,8 +40,8 @@
 #include <svl/sharecontrolfile.hxx>
 #include <svl/urihelper.hxx>
 #include <osl/file.hxx>
-#include "chgtrack.hxx"
-#include "chgviset.hxx"
+#include <chgtrack.hxx>
+#include <chgviset.hxx>
 #include <com/sun/star/awt/Key.hpp>
 #include <com/sun/star/awt/KeyModifier.hpp>
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
@@ -66,54 +66,54 @@
 
 #include <config_folders.h>
 
-#include "scabstdlg.hxx"
+#include <scabstdlg.hxx>
 #include <sot/formats.hxx>
 #include <svx/dialogs.hrc>
 
-#include "formulacell.hxx"
-#include "postit.hxx"
-#include "global.hxx"
-#include "filter.hxx"
-#include "scmod.hxx"
-#include "tabvwsh.hxx"
-#include "docfunc.hxx"
-#include "imoptdlg.hxx"
-#include "impex.hxx"
-#include "scresid.hxx"
-#include "strings.hrc"
-#include "globstr.hrc"
-#include "scerrors.hxx"
-#include "brdcst.hxx"
-#include "stlpool.hxx"
-#include "autostyl.hxx"
-#include "attrib.hxx"
-#include "asciiopt.hxx"
-#include "waitoff.hxx"
-#include "docpool.hxx"
-#include "progress.hxx"
-#include "pntlock.hxx"
-#include "docuno.hxx"
-#include "appoptio.hxx"
-#include "detdata.hxx"
-#include "printfun.hxx"
-#include "dociter.hxx"
-#include "cellform.hxx"
-#include "chartlis.hxx"
-#include "hints.hxx"
-#include "xmlwrap.hxx"
-#include "drwlayer.hxx"
-#include "refreshtimer.hxx"
-#include "dbdata.hxx"
-#include "scextopt.hxx"
-#include "compiler.hxx"
-#include "warnpassword.hxx"
-#include "optsolver.hxx"
-#include "sheetdata.hxx"
-#include "tabprotection.hxx"
-#include "docparam.hxx"
+#include <formulacell.hxx>
+#include <postit.hxx>
+#include <global.hxx>
+#include <filter.hxx>
+#include <scmod.hxx>
+#include <tabvwsh.hxx>
+#include <docfunc.hxx>
+#include <imoptdlg.hxx>
+#include <impex.hxx>
+#include <scresid.hxx>
+#include <strings.hrc>
+#include <globstr.hrc>
+#include <scerrors.hxx>
+#include <brdcst.hxx>
+#include <stlpool.hxx>
+#include <autostyl.hxx>
+#include <attrib.hxx>
+#include <asciiopt.hxx>
+#include <waitoff.hxx>
+#include <docpool.hxx>
+#include <progress.hxx>
+#include <pntlock.hxx>
+#include <docuno.hxx>
+#include <appoptio.hxx>
+#include <detdata.hxx>
+#include <printfun.hxx>
+#include <dociter.hxx>
+#include <cellform.hxx>
+#include <chartlis.hxx>
+#include <hints.hxx>
+#include <xmlwrap.hxx>
+#include <drwlayer.hxx>
+#include <refreshtimer.hxx>
+#include <dbdata.hxx>
+#include <scextopt.hxx>
+#include <compiler.hxx>
+#include <warnpassword.hxx>
+#include <optsolver.hxx>
+#include <sheetdata.hxx>
+#include <tabprotection.hxx>
+#include <docparam.hxx>
 #include "docshimp.hxx"
-#include "sizedev.hxx"
-#include "refreshtimerprotector.hxx"
+#include <sizedev.hxx>
+#include <refreshtimerprotector.hxx>
 #include <orcus/orcus_import_ods.hpp>
 #include <orcusfiltersimpl.hxx>
 
@@ -121,12 +121,12 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <unotools/configmgr.hxx>
-#include "uiitems.hxx"
-#include "cellsuno.hxx"
-#include "dpobject.hxx"
-#include "markdata.hxx"
-#include "optuno.hxx"
-#include "orcusfilters.hxx"
+#include <uiitems.hxx>
+#include <cellsuno.hxx>
+#include <dpobject.hxx>
+#include <markdata.hxx>
+#include <optuno.hxx>
+#include <orcusfilters.hxx>
 #include <datastream.hxx>
 #include <documentlinkmgr.hxx>
 #include <refupdatecontext.hxx>
@@ -163,7 +163,7 @@ static const sal_Char pFilterHtmlWebQ[] = "calc_HTML_WebQuery";
 static const sal_Char pFilterRtf[]      = "Rich Text Format (StarCalc)";
 
 #define ScDocShell
-#include "scslots.hxx"
+#include <scslots.hxx>
 
 SFX_IMPL_INTERFACE(ScDocShell,SfxObjectShell)
 
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index 1098f2c9025b..4de6e328ee72 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "scitems.hxx"
+#include <scitems.hxx>
 #include <rtl/bootstrap.hxx>
 #include <osl/file.hxx>
 #include <svx/drawitem.hxx>
@@ -29,13 +29,13 @@
 #include <config_folders.h>
 #include <unotools/configmgr.hxx>
 
-#include "drwlayer.hxx"
-#include "stlpool.hxx"
-#include "docsh.hxx"
+#include <drwlayer.hxx>
+#include <stlpool.hxx>
+#include <docsh.hxx>
 #include "docshimp.hxx"
-#include "docfunc.hxx"
-#include "sc.hrc"
-#include "filter.hxx"
+#include <docfunc.hxx>
+#include <sc.hrc>
+#include <filter.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 93a7e4394d48..a0b4bf3858e5 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -20,8 +20,8 @@
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 
-#include "scitems.hxx"
-#include "rangelst.hxx"
+#include <scitems.hxx>
+#include <rangelst.hxx>
 #include <editeng/flstitem.hxx>
 #include <editeng/paperinf.hxx>
 #include <editeng/sizeitem.hxx>
@@ -35,32 +35,32 @@
 #include <vcl/virdev.hxx>
 #include <vcl/msgbox.hxx>
 
-#include "docsh.hxx"
+#include <docsh.hxx>
 #include "docshimp.hxx"
-#include "scmod.hxx"
-#include "tabvwsh.hxx"
-#include "viewdata.hxx"
-#include "docpool.hxx"
-#include "stlpool.hxx"
-#include "patattr.hxx"
-#include "uiitems.hxx"
-#include "hints.hxx"
-#include "docoptio.hxx"
-#include "viewopti.hxx"
-#include "pntlock.hxx"
-#include "chgtrack.hxx"
-#include "docfunc.hxx"
-#include "formulacell.hxx"
-#include "chgviset.hxx"
-#include "progress.hxx"
-#include "redcom.hxx"
-#include "sc.hrc"
-#include "inputopt.hxx"
-#include "drwlayer.hxx"
-#include "inputhdl.hxx"
-#include "conflictsdlg.hxx"
-#include "globstr.hrc"
-#include "markdata.hxx"
+#include <scmod.hxx>
+#include <tabvwsh.hxx>
+#include <viewdata.hxx>
+#include <docpool.hxx>
+#include <stlpool.hxx>
+#include <patattr.hxx>
+#include <uiitems.hxx>
+#include <hints.hxx>
+#include <docoptio.hxx>
+#include <viewopti.hxx>
+#include <pntlock.hxx>
+#include <chgtrack.hxx>
+#include <docfunc.hxx>
+#include <formulacell.hxx>
+#include <chgviset.hxx>
+#include <progress.hxx>
+#include <redcom.hxx>
+#include <sc.hrc>
+#include <inputopt.hxx>
+#include <drwlayer.hxx>
+#include <inputhdl.hxx>
+#include <conflictsdlg.hxx>
+#include <globstr.hrc>
+#include <markdata.hxx>
 #include <memory>
 
 #include <comphelper/lok.hxx>
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 8cfb5fc81a2a..7654fdca0459 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -28,7 +28,7 @@ using namespace ::com::sun::star;
 
 #include <math.h>
 
-#include "scitems.hxx"
+#include <scitems.hxx>
 #include <editeng/flstitem.hxx>
 #include <editeng/langitem.hxx>
 #include <sfx2/fcontnr.hxx>
@@ -60,54 +60,54 @@ using namespace ::com::sun::star;
 
 #include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
-#include "docuno.hxx"
+#include <docuno.hxx>
 
 #include <com/sun/star/sdbc/XResultSet.hpp>
-#include "docsh.hxx"
+#include <docsh.hxx>
 #include "docshimp.hxx"
-#include "docfunc.hxx"
-#include "scres.hrc"
-#include "strings.hrc"
-#include "stlsheet.hxx"
-#include "stlpool.hxx"
-#include "appoptio.hxx"
-#include "globstr.hrc"
-#include "global.hxx"
-#include "dbdocfun.hxx"
-#include "printfun.hxx"
-#include "viewdata.hxx"
-#include "tabvwsh.hxx"
-#include "impex.hxx"
-#include "attrib.hxx"
-#include "undodat.hxx"
-#include "autostyl.hxx"
-#include "undocell.hxx"
-#include "undotab.hxx"
-#include "inputhdl.hxx"
-#include "dbdata.hxx"
-#include "servobj.hxx"
-#include "rangenam.hxx"
-#include "scmod.hxx"
-#include "chgviset.hxx"
-#include "reffact.hxx"
-#include "chartlis.hxx"
-#include "chartpos.hxx"
-#include "waitoff.hxx"
-#include "tablink.hxx"
-#include "drwlayer.hxx"
-#include "docoptio.hxx"
-#include "undostyl.hxx"
-#include "rangeseq.hxx"
-#include "chgtrack.hxx"
-#include "printopt.hxx"
+#include <docfunc.hxx>
+#include <scres.hrc>
+#include <strings.hrc>
+#include <stlsheet.hxx>
+#include <stlpool.hxx>
+#include <appoptio.hxx>
+#include <globstr.hrc>
+#include <global.hxx>
+#include <dbdocfun.hxx>
+#include <printfun.hxx>
+#include <viewdata.hxx>
+#include <tabvwsh.hxx>
+#include <impex.hxx>
+#include <attrib.hxx>
+#include <undodat.hxx>
+#include <autostyl.hxx>
+#include <undocell.hxx>
+#include <undotab.hxx>
+#include <inputhdl.hxx>
+#include <dbdata.hxx>
+#include <servobj.hxx>
+#include <rangenam.hxx>
+#include <scmod.hxx>
+#include <chgviset.hxx>
+#include <reffact.hxx>
+#include <chartlis.hxx>
+#include <chartpos.hxx>
+#include <waitoff.hxx>
+#include <tablink.hxx>
+#include <drwlayer.hxx>
+#include <docoptio.hxx>
+#include <undostyl.hxx>
+#include <rangeseq.hxx>
+#include <chgtrack.hxx>
+#include <printopt.hxx>
 #include <com/sun/star/document/UpdateDocMode.hpp>
-#include "scresid.hxx"
-#include "scabstdlg.hxx"
-#include "externalrefmgr.hxx"
-#include "sharedocdlg.hxx"
-#include "conditio.hxx"
-#include "sheetevents.hxx"
-#include "formulacell.hxx"
+#include <scresid.hxx>
+#include <scabstdlg.hxx>
+#include <externalrefmgr.hxx>
+#include <sharedocdlg.hxx>
+#include <conditio.hxx>
+#include <sheetevents.hxx>
+#include <formulacell.hxx>
 #include <documentlinkmgr.hxx>
 #include <memory>
 #include <sfx2/notebookbar/SfxNotebookBar.hxx>
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index 90fbe83b80d5..d6df70586af0 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -22,7 +22,7 @@
 
 #include <cassert>
 
-#include "scitems.hxx"
+#include <scitems.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/waitobj.hxx>
 #include <sfx2/app.hxx>
@@ -30,28 +30,28 @@
 
 #include <com/sun/star/script/vba/XVBACompatibility.hpp>
 
-#include "docsh.hxx"
-#include "global.hxx"
-#include "globstr.hrc"
-#include "globalnames.hxx"
-#include "undodat.hxx"
-#include "undotab.hxx"
-#include "undoblk.hxx"
-#include "dpobject.hxx"
-#include "dpshttab.hxx"
-#include "dbdocfun.hxx"
-#include "consoli.hxx"
-#include "dbdata.hxx"
-#include "progress.hxx"
-#include "olinetab.hxx"
-#include "patattr.hxx"
-#include "attrib.hxx"
-#include "docpool.hxx"
-#include "uiitems.hxx"
-#include "sc.hrc"
-#include "waitoff.hxx"
-#include "sizedev.hxx"
-#include "clipparam.hxx"
+#include <docsh.hxx>
+#include <global.hxx>
+#include <globstr.hrc>
+#include <globalnames.hxx>
+#include <undodat.hxx>
+#include <undotab.hxx>
+#include <undoblk.hxx>
+#include <dpobject.hxx>
+#include <dpshttab.hxx>
+#include <dbdocfun.hxx>
+#include <consoli.hxx>
+#include <dbdata.hxx>
+#include <progress.hxx>
+#include <olinetab.hxx>
+#include <patattr.hxx>
+#include <attrib.hxx>
+#include <docpool.hxx>
+#include <uiitems.hxx>
+#include <sc.hrc>
+#include <waitoff.hxx>
+#include <sizedev.hxx>
+#include <clipparam.hxx>
 #include <rowheightcontext.hxx>
 #include <refupdatecontext.hxx>
 
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index 97ca6c119887..9ec7631aa749 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -17,25 +17,25 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "scitems.hxx"
+#include <scitems.hxx>
 
 #include <o3tl/make_unique.hxx>
 #include <svx/pageitem.hxx>
 #include <sfx2/linkmgr.hxx>
 
-#include "docsh.hxx"
-
-#include "stlsheet.hxx"
-#include "stlpool.hxx"
-#include "global.hxx"
-#include "viewdata.hxx"
-#include "tabvwsh.hxx"
-#include "tablink.hxx"
-#include "globstr.hrc"
-#include "scmod.hxx"
-#include "compiler.hxx"
-#include "interpre.hxx"
-#include "calcconfig.hxx"
+#include <docsh.hxx>
+
+#include <stlsheet.hxx>
+#include <stlpool.hxx>
+#include <global.hxx>
+#include <viewdata.hxx>
+#include <tabvwsh.hxx>
+#include <tablink.hxx>
+#include <globstr.hrc>
+#include <scmod.hxx>
+#include <compiler.hxx>
+#include <interpre.hxx>
+#include <calcconfig.hxx>
 
 #include <vcl/msgbox.hxx>
 
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index c9b2dd313f17..198cc709debe 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -59,24 +59,24 @@
 #include <com/sun/star/ucb/TransferInfo.hpp>
 #include <com/sun/star/ucb/XCommandInfo.hpp>
 
-#include "scerrors.hxx"
-#include "docsh.hxx"
-#include "filter.hxx"
-#include "progress.hxx"
-#include "formulacell.hxx"
-#include "editutil.hxx"
-#include "cellform.hxx"
-#include "dbdocutl.hxx"
-#include "dociter.hxx"
-#include "globstr.hrc"
+#include <scerrors.hxx>
+#include <docsh.hxx>
+#include <filter.hxx>
+#include <progress.hxx>
+#include <formulacell.hxx>
+#include <editutil.hxx>
+#include <cellform.hxx>
+#include <dbdocutl.hxx>
+#include <dociter.hxx>
+#include <globstr.hrc>
 #include <svl/zformat.hxx>
 #include <svl/intitem.hxx>
-#include "patattr.hxx"
-#include "scitems.hxx"
-#include "docpool.hxx"
-#include "segmenttree.hxx"
-#include "docparam.hxx"
-#include "cellvalue.hxx"
+#include <patattr.hxx>
+#include <scitems.hxx>
+#include <docpool.hxx>
+#include <segmenttree.hxx>
+#include <docparam.hxx>
+#include <cellvalue.hxx>
 
 #include <unordered_set>
 #include <vector>
diff --git a/sc/source/ui/docshell/editable.cxx b/sc/source/ui/docshell/editable.cxx
index 22e1ed7027ff..3b0f58ee653f 100644
--- a/sc/source/ui/docshell/editable.cxx
+++ b/sc/source/ui/docshell/editable.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "editable.hxx"
-#include "document.hxx"
-#include "viewfunc.hxx"
-#include "globstr.hrc"
-#include "markdata.hxx"
+#include <editable.hxx>
+#include <document.hxx>
+#include <viewfunc.hxx>
+#include <globstr.hrc>
+#include <markdata.hxx>
 
 ScEditableTester::ScEditableTester() :
     mbIsEditable(true),
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index fe36e9f0a07c..beb47fc010dd 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -17,22 +17,22 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "externalrefmgr.hxx"
-#include "document.hxx"
-#include "token.hxx"
-#include "tokenarray.hxx"
-#include "address.hxx"
-#include "tablink.hxx"
-#include "docsh.hxx"
-#include "scextopt.hxx"
-#include "rangenam.hxx"
-#include "formulacell.hxx"
-#include "viewdata.hxx"
-#include "tabvwsh.hxx"
-#include "sc.hrc"
-#include "globstr.hrc"
-#include "cellvalue.hxx"
-#include "defaultsoptions.hxx"
+#include <externalrefmgr.hxx>
+#include <document.hxx>
+#include <token.hxx>
+#include <tokenarray.hxx>
+#include <address.hxx>
+#include <tablink.hxx>
+#include <docsh.hxx>
+#include <scextopt.hxx>
+#include <rangenam.hxx>
+#include <formulacell.hxx>
+#include <viewdata.hxx>
+#include <tabvwsh.hxx>
+#include <sc.hrc>
+#include <globstr.hrc>
+#include <cellvalue.hxx>
+#include <defaultsoptions.hxx>
 
 #include <osl/file.hxx>
 #include <sfx2/app.hxx>
@@ -51,8 +51,8 @@
 #include <tools/urlobj.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <vcl/msgbox.hxx>
-#include "stringutil.hxx"
-#include "scmatrix.hxx"
+#include <stringutil.hxx>
+#include <scmatrix.hxx>
 #include <columnspanset.hxx>
 #include <column.hxx>
 #include <com/sun/star/document/MacroExecMode.hpp>
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 7a6dca99ad89..80069b4eef59 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sc.hrc"
+#include <sc.hrc>
 
 #include <comphelper/processfactory.hxx>
 #include <i18nlangtag/languagetag.hxx>
@@ -25,34 +25,34 @@
 #include <sfx2/mieclip.hxx>
 #include <com/sun/star/i18n/CalendarFieldIndex.hpp>
 
-#include "global.hxx"
-#include "scerrors.hxx"
-#include "docsh.hxx"
-#include "undoblk.hxx"
-#include "rangenam.hxx"
-#include "viewdata.hxx"
-#include "tabvwsh.hxx"
-#include "filter.hxx"
-#include "asciiopt.hxx"
-#include "formulacell.hxx"
-#include "cellform.hxx"
-#include "docoptio.hxx"
-#include "progress.hxx"
-#include "scitems.hxx"
-#include "editable.hxx"
-#include "compiler.hxx"
-#include "warnbox.hxx"
-#include "clipparam.hxx"
-#include "impex.hxx"
-#include "editutil.hxx"
-#include "patattr.hxx"
-#include "docpool.hxx"
-#include "stringutil.hxx"
-#include "cellvalue.hxx"
-#include "tokenarray.hxx"
-#include "documentimport.hxx"
-
-#include "globstr.hrc"
+#include <global.hxx>
+#include <scerrors.hxx>
+#include <docsh.hxx>
+#include <undoblk.hxx>
+#include <rangenam.hxx>
+#include <viewdata.hxx>
+#include <tabvwsh.hxx>
+#include <filter.hxx>
+#include <asciiopt.hxx>
+#include <formulacell.hxx>
+#include <cellform.hxx>
+#include <docoptio.hxx>
+#include <progress.hxx>
+#include <scitems.hxx>
+#include <editable.hxx>
+#include <compiler.hxx>
+#include <warnbox.hxx>
+#include <clipparam.hxx>
+#include <impex.hxx>
+#include <editutil.hxx>
+#include <patattr.hxx>
+#include <docpool.hxx>
+#include <stringutil.hxx>
+#include <cellvalue.hxx>
+#include <tokenarray.hxx>
+#include <documentimport.hxx>
+
+#include <globstr.hrc>
 #include <vcl/svapp.hxx>
 
 #include <memory>
diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx
index e8e365658bfd..716a2de7aeca 100644
--- a/sc/source/ui/docshell/macromgr.cxx
+++ b/sc/source/ui/docshell/macromgr.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "macromgr.hxx"
-#include "document.hxx"
+#include <macromgr.hxx>
+#include <document.hxx>
 
 #include <basic/basmgr.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <sfx2/objsh.hxx>
-#include "formulacell.hxx"
+#include <formulacell.hxx>
 #include <vector>
 #include <com/sun/star/container/XContainer.hpp>
 
diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx
index aaa8f3ede600..fc9d50448193 100644
--- a/sc/source/ui/docshell/olinefun.cxx
+++ b/sc/source/ui/docshell/olinefun.cxx
@@ -19,13 +19,13 @@
 
 #include <sfx2/bindings.hxx>
 
-#include "olinefun.hxx"
+#include <olinefun.hxx>
 
-#include "docsh.hxx"
-#include "olinetab.hxx"
-#include "undodat.hxx"
-#include "globstr.hrc"
-#include "sc.hrc"
+#include <docsh.hxx>
+#include <olinetab.hxx>
+#include <undodat.hxx>
+#include <globstr.hrc>
+#include <sc.hrc>
 
 static void lcl_InvalidateOutliner( SfxBindings* pBindings )
 {
diff --git a/sc/source/ui/docshell/pagedata.cxx b/sc/source/ui/docshell/pagedata.cxx
index 94ce9277776c..0b185a6e93af 100644
--- a/sc/source/ui/docshell/pagedata.cxx
+++ b/sc/source/ui/docshell/pagedata.cxx
@@ -19,7 +19,7 @@
 
 #include <string.h>
 
-#include "pagedata.hxx"
+#include <pagedata.hxx>
 
 #include <osl/diagnose.h>
 
diff --git a/sc/source/ui/docshell/pntlock.cxx b/sc/source/ui/docshell/pntlock.cxx
index ed7aca968e17..39713941c050 100644
--- a/sc/source/ui/docshell/pntlock.cxx
+++ b/sc/source/ui/docshell/pntlock.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "pntlock.hxx"
+#include <pntlock.hxx>
 
 ScPaintLockData::ScPaintLockData() :
     nLevel( 0 ),
diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx
index d3635deccf1f..712da4e96ade 100644
--- a/sc/source/ui/docshell/servobj.cxx
+++ b/sc/source/ui/docshell/servobj.cxx
@@ -20,12 +20,12 @@
 #include <sot/formats.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/linkmgr.hxx>
-#include "servobj.hxx"
-#include "docsh.hxx"
-#include "impex.hxx"
-#include "brdcst.hxx"
-#include "rangenam.hxx"
-#include "sc.hrc"
+#include <servobj.hxx>
+#include <docsh.hxx>
+#include <impex.hxx>
+#include <brdcst.hxx>
+#include <rangenam.hxx>
+#include <sc.hrc>
 
 using namespace formula;
 
diff --git a/sc/source/ui/docshell/sizedev.cxx b/sc/source/ui/docshell/sizedev.cxx
index aaa37e1971a2..4cf8e4e0000f 100644
--- a/sc/source/ui/docshell/sizedev.cxx
+++ b/sc/source/ui/docshell/sizedev.cxx
@@ -20,10 +20,10 @@
 #include <sfx2/printer.hxx>
 #include <vcl/virdev.hxx>
 
-#include "sizedev.hxx"
-#include "docsh.hxx"
-#include "scmod.hxx"
-#include "inputopt.hxx"
+#include <sizedev.hxx>
+#include <docsh.hxx>
+#include <scmod.hxx>
+#include <inputopt.hxx>
 
 ScSizeDeviceProvider::ScSizeDeviceProvider( ScDocShell* pDocSh )
 {
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index 19b1f68d62f2..1166412616b1 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -32,22 +32,22 @@
 #include <unotools/transliterationwrapper.hxx>
 #include <unotools/configmgr.hxx>
 
-#include "tablink.hxx"
-
-#include "scextopt.hxx"
-#include "table.hxx"
-#include "document.hxx"
-#include "docsh.hxx"
-#include "globstr.hrc"
-#include "undoblk.hxx"
-#include "undotab.hxx"
-#include "global.hxx"
-#include "hints.hxx"
-#include "dociter.hxx"
+#include <tablink.hxx>
+
+#include <scextopt.hxx>
+#include <table.hxx>
+#include <document.hxx>
+#include <docsh.hxx>
+#include <globstr.hrc>
+#include <undoblk.hxx>
+#include <undotab.hxx>
+#include <global.hxx>
+#include <hints.hxx>
+#include <dociter.hxx>
 #include <formula/opcode.hxx>
-#include "formulacell.hxx"
-#include "formulaiter.hxx"
-#include "tokenarray.hxx"
+#include <formulacell.hxx>
+#include <formulaiter.hxx>
+#include <tokenarray.hxx>
 
 struct TableLink_Impl
 {
diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx
index 9fc5bf9312c9..621e2150f09c 100644
--- a/sc/source/ui/docshell/tpstat.cxx
+++ b/sc/source/ui/docshell/tpstat.cxx
@@ -19,11 +19,11 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-#include "document.hxx"
-#include "docsh.hxx"
-#include "scresid.hxx"
+#include <document.hxx>
+#include <docsh.hxx>
+#include <scresid.hxx>
 
-#include "tpstat.hxx"
+#include <tpstat.hxx>
 
 // Dokumentinfo-Tabpage: