loplugin:includeform: sc

Change-Id: I2ed763e0584a188032c80fde60890de3c6985cbd

32 files changed, 202 insertions, 202 deletions

diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index e2bcac817219..129969c926f3 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -9,15 +9,15 @@
  * This file incorporates work covered by the following license notice:
  */
 
-#include "PivotLayoutTreeList.hxx"
-#include "PivotLayoutDialog.hxx"
+#include <PivotLayoutTreeList.hxx>
+#include <PivotLayoutDialog.hxx>
 #include <reffact.hxx>
 #include <svtools/treelistentry.hxx>
 
-#include "rangeutl.hxx"
-#include "uiitems.hxx"
-#include "dputil.hxx"
-#include "dbdocfun.hxx"
+#include <rangeutl.hxx>
+#include <uiitems.hxx>
+#include <dputil.hxx>
+#include <dbdocfun.hxx>
 
 #include <memory>
 #include <vector>
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
index 9e54339cc1ab..5c542b238772 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
@@ -10,13 +10,13 @@
  */
 
 #include <memory>
-#include "PivotLayoutTreeList.hxx"
-#include "PivotLayoutDialog.hxx"
+#include <PivotLayoutTreeList.hxx>
+#include <PivotLayoutDialog.hxx>
 
 #include <vcl/builderfactory.hxx>
 #include <svtools/treelistentry.hxx>
-#include "pivot.hxx"
-#include "scabstdlg.hxx"
+#include <pivot.hxx>
+#include <scabstdlg.hxx>
 
 VCL_BUILDER_FACTORY_ARGS(ScPivotLayoutTreeList,
                          WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN)
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
index cb7a1580050b..236a939655ca 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
@@ -9,12 +9,12 @@
  * This file incorporates work covered by the following license notice:
  */
 
-#include "PivotLayoutTreeListBase.hxx"
-#include "PivotLayoutDialog.hxx"
+#include <PivotLayoutTreeListBase.hxx>
+#include <PivotLayoutDialog.hxx>
 
 #include <reffact.hxx>
 #include <svtools/treelistentry.hxx>
-#include "scabstdlg.hxx"
+#include <scabstdlg.hxx>
 
 ScPivotLayoutTreeListBase::ScPivotLayoutTreeListBase(vcl::Window* pParent, WinBits nBits, SvPivotTreeListType eType)
     : SvTreeListBox(pParent, nBits)
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
index ecefc420bcfc..bd3480772c3f 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
@@ -10,14 +10,14 @@
  */
 
 #include <memory>
-#include "PivotLayoutTreeListData.hxx"
-#include "PivotLayoutDialog.hxx"
+#include <PivotLayoutTreeListData.hxx>
+#include <PivotLayoutDialog.hxx>
 
 #include <vcl/builderfactory.hxx>
 #include <svtools/treelistentry.hxx>
-#include "pivot.hxx"
-#include "scabstdlg.hxx"
-#include "globstr.hrc"
+#include <pivot.hxx>
+#include <scabstdlg.hxx>
+#include <globstr.hrc>
 
 VCL_BUILDER_FACTORY_ARGS(ScPivotLayoutTreeListData,
                          WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN)
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx
index 1b3d09e9fabe..0672c7905632 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx
@@ -10,13 +10,13 @@
  */
 
 #include <memory>
-#include "PivotLayoutTreeListLabel.hxx"
-#include "PivotLayoutDialog.hxx"
+#include <PivotLayoutTreeListLabel.hxx>
+#include <PivotLayoutDialog.hxx>
 
 #include <vcl/builderfactory.hxx>
 #include <svtools/treelistentry.hxx>
-#include "pivot.hxx"
-#include "scabstdlg.hxx"
+#include <pivot.hxx>
+#include <scabstdlg.hxx>
 
 VCL_BUILDER_FACTORY_ARGS(ScPivotLayoutTreeListLabel,
                          WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN);
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index 67afc817eb69..e75d5f02ec43 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "global.hxx"
-#include "asciiopt.hxx"
+#include <global.hxx>
+#include <asciiopt.hxx>
 #include <comphelper/string.hxx>
 #include <osl/thread.h>
 
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index 7f39b99861a3..7d1ccc0f6b33 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -19,19 +19,19 @@
 
 #include <sfx2/dispatch.hxx>
 
-#include "tabvwsh.hxx"
-#include "uiitems.hxx"
-#include "dbdata.hxx"
-#include "rangenam.hxx"
-#include "rangeutl.hxx"
-#include "reffact.hxx"
-#include "document.hxx"
-#include "scresid.hxx"
-
-#include "globstr.hrc"
-#include "strings.hrc"
-
-#include "consdlg.hxx"
+#include <tabvwsh.hxx>
+#include <uiitems.hxx>
+#include <dbdata.hxx>
+#include <rangenam.hxx>
+#include <rangeutl.hxx>
+#include <reffact.hxx>
+#include <document.hxx>
+#include <scresid.hxx>
+
+#include <globstr.hrc>
+#include <strings.hrc>
+
+#include <consdlg.hxx>
 #include <vcl/msgbox.hxx>
 
 #define INFOBOX(id) ScopedVclPtrInstance<InfoBox>(this, ScGlobal::GetRscString(id))->Execute()
diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx
index 40aee4e35444..5af764c32b1a 100644
--- a/sc/source/ui/dbgui/csvcontrol.cxx
+++ b/sc/source/ui/dbgui/csvcontrol.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "csvcontrol.hxx"
+#include <csvcontrol.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include "AccessibleCsvControl.hxx"
+#include <AccessibleCsvControl.hxx>
 
 ScCsvLayoutData::ScCsvLayoutData() :
     mnPosCount( 1 ),
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 9279302af01c..1ef24a76c9c6 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "csvgrid.hxx"
+#include <csvgrid.hxx>
 
 #include <algorithm>
 #include <memory>
@@ -26,13 +26,13 @@
 #include <svtools/colorcfg.hxx>
 #include <sal/macros.h>
 #include <tools/poly.hxx>
-#include "scmod.hxx"
-#include "asciiopt.hxx"
-#include "impex.hxx"
-#include "AccessibleCsvControl.hxx"
+#include <scmod.hxx>
+#include <asciiopt.hxx>
+#include <impex.hxx>
+#include <AccessibleCsvControl.hxx>
 
 // *** edit engine ***
-#include "scitems.hxx"
+#include <scitems.hxx>
 #include <editeng/eeitem.hxx>
 #include <vcl/settings.hxx>
 
@@ -40,7 +40,7 @@
 #include <editeng/fhgtitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <svl/itemset.hxx>
-#include "editutil.hxx"
+#include <editutil.hxx>
 // *** edit engine ***
 
 struct Func_SetType
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index be4b48ba9763..00e85c71f78b 100644
--- a/sc/source/ui/dbgui/csvruler.cxx
+++ b/sc/source/ui/dbgui/csvruler.cxx
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "csvruler.hxx"
-#include "AccessibleCsvControl.hxx"
+#include <csvruler.hxx>
+#include <AccessibleCsvControl.hxx>
 
 #include <optutil.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <comphelper/string.hxx>
 #include <vcl/settings.hxx>
-#include "miscuno.hxx"
+#include <miscuno.hxx>
 
 using namespace com::sun::star::uno;
 
diff --git a/sc/source/ui/dbgui/csvsplits.cxx b/sc/source/ui/dbgui/csvsplits.cxx
index ccf87b2b781d..3b8c57b199ef 100644
--- a/sc/source/ui/dbgui/csvsplits.cxx
+++ b/sc/source/ui/dbgui/csvsplits.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "csvsplits.hxx"
+#include <csvsplits.hxx>
 
 #include <algorithm>
 
diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx
index cb23052062f4..0ebe2de56130 100644
--- a/sc/source/ui/dbgui/csvtablebox.cxx
+++ b/sc/source/ui/dbgui/csvtablebox.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "csvtablebox.hxx"
+#include <csvtablebox.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/settings.hxx>
-#include "editutil.hxx"
-#include "AccessibleCsvControl.hxx"
+#include <editutil.hxx>
+#include <AccessibleCsvControl.hxx>
 
 ScCsvTableBox::ScCsvTableBox( vcl::Window* pParent, WinBits nBits ) :
     ScCsvControl( pParent, maData, nBits ),
diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index b7058d95a722..7dc6efab5440 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -32,11 +32,11 @@
 
 using namespace com::sun::star;
 
-#include "dapidata.hxx"
-#include "scresid.hxx"
-#include "sc.hrc"
-#include "miscuno.hxx"
-#include "dpsdbtab.hxx"
+#include <dapidata.hxx>
+#include <scresid.hxx>
+#include <sc.hrc>
+#include <miscuno.hxx>
+#include <dpsdbtab.hxx>
 
 //  entries in the "type" ListBox
 #define DP_TYPELIST_TABLE   0
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index 7a314a4cacc9..9f0ab712328e 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -19,9 +19,9 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-#include "dapitype.hxx"
-#include "scresid.hxx"
-#include "sc.hrc"
+#include <dapitype.hxx>
+#include <scresid.hxx>
+#include <sc.hrc>
 
 using namespace com::sun::star;
 
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 2fa343f09be4..bcad163d8623 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -25,13 +25,13 @@
 #include <comphelper/string.hxx>
 #include <vcl/msgbox.hxx>
 
-#include "reffact.hxx"
-#include "document.hxx"
-#include "scresid.hxx"
-#include "globstr.hrc"
-#include "rangenam.hxx"
-#include "globalnames.hxx"
-#include "dbnamdlg.hxx"
+#include <reffact.hxx>
+#include <document.hxx>
+#include <scresid.hxx>
+#include <globstr.hrc>
+#include <rangenam.hxx>
+#include <globalnames.hxx>
+#include <dbnamdlg.hxx>
 #include <dbdocfun.hxx>
 
 class DBSaveData;
diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx
index a8071c7b5ea6..dbcd78dbfa28 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.cxx
+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx
@@ -21,10 +21,10 @@
 #undef SC_DLLIMPLEMENTATION
 #endif
 
-#include "dpgroupdlg.hxx"
-#include "scresid.hxx"
-#include "sc.hrc"
-#include "globstr.hrc"
+#include <dpgroupdlg.hxx>
+#include <scresid.hxx>
+#include <sc.hrc>
+#include <globstr.hrc>
 
 #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
 
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 0e90afc54458..100de526766a 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -21,21 +21,21 @@
 #include <sfx2/dispatch.hxx>
 #include <vcl/waitobj.hxx>
 
-#include "uiitems.hxx"
-#include "dbdata.hxx"
-#include "reffact.hxx"
-#include "viewdata.hxx"
-#include "document.hxx"
-#include "docsh.hxx"
-#include "scresid.hxx"
-#include "queryentry.hxx"
+#include <uiitems.hxx>
+#include <dbdata.hxx>
+#include <reffact.hxx>
+#include <viewdata.hxx>
+#include <document.hxx>
+#include <docsh.hxx>
+#include <scresid.hxx>
+#include <queryentry.hxx>
 
-#include "foptmgr.hxx"
+#include <foptmgr.hxx>
 
-#include "globstr.hrc"
-#include "strings.hrc"
+#include <globstr.hrc>
+#include <strings.hrc>
 
-#include "filtdlg.hxx"
+#include <filtdlg.hxx>
 #include <vcl/layout.hxx>
 #include <svl/sharedstringpool.hxx>
 
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index a492b92264d7..b96c24b876ea 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "anyrefdg.hxx"
-#include "rangeutl.hxx"
-#include "dbdata.hxx"
-#include "viewdata.hxx"
-#include "document.hxx"
-#include "queryparam.hxx"
-#include "globalnames.hxx"
-
-#include "foptmgr.hxx"
+#include <anyrefdg.hxx>
+#include <rangeutl.hxx>
+#include <dbdata.hxx>
+#include <viewdata.hxx>
+#include <document.hxx>
+#include <queryparam.hxx>
+#include <globalnames.hxx>
+
+#include <foptmgr.hxx>
 
 // ScFilterOptionsMgr (.ui's option helper)
 
diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx
index 0d9a2460b411..2959f07048aa 100644
--- a/sc/source/ui/dbgui/imoptdlg.cxx
+++ b/sc/source/ui/dbgui/imoptdlg.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "imoptdlg.hxx"
-#include "asciiopt.hxx"
-#include "scresid.hxx"
+#include <imoptdlg.hxx>
+#include <asciiopt.hxx>
+#include <scresid.hxx>
 #include <comphelper/string.hxx>
 #include <osl/thread.h>
 #include <rtl/tencinfo.h>
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 702408c86481..cdb6cf3516eb 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -21,21 +21,21 @@
 
 #include <vcl/waitobj.hxx>
 
-#include "viewdata.hxx"
-#include "document.hxx"
-#include "uiitems.hxx"
-#include "global.hxx"
-#include "globalnames.hxx"
-#include "dbdata.hxx"
-#include "scresid.hxx"
-#include "queryentry.hxx"
-#include "filterentries.hxx"
-
-#include "sc.hrc"
-#include "strings.hrc"
-#include "globstr.hrc"
-
-#include "pfiltdlg.hxx"
+#include <viewdata.hxx>
+#include <document.hxx>
+#include <uiitems.hxx>
+#include <global.hxx>
+#include <globalnames.hxx>
+#include <dbdata.hxx>
+#include <scresid.hxx>
+#include <queryentry.hxx>
+#include <filterentries.hxx>
+
+#include <sc.hrc>
+#include <strings.hrc>
+#include <globstr.hrc>
+
+#include <pfiltdlg.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/sharedstringpool.hxx>
 
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 0529216c2834..037ed41d0994 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -19,7 +19,7 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-#include "pvfundlg.hxx"
+#include <pvfundlg.hxx>
 
 #include <com/sun/star/sheet/DataPilotFieldReferenceType.hpp>
 #include <com/sun/star/sheet/DataPilotFieldReferenceItemType.hpp>
@@ -30,14 +30,14 @@
 #include <vcl/builderfactory.hxx>
 #include <vcl/msgbox.hxx>
 
-#include "scresid.hxx"
-#include "dpobject.hxx"
-#include "dpsave.hxx"
-#include "pvfundlg.hrc"
-#include "strings.hrc"
-#include "scmod.hxx"
-#include "globstr.hrc"
-#include "dputil.hxx"
+#include <scresid.hxx>
+#include <dpobject.hxx>
+#include <dpsave.hxx>
+#include <pvfundlg.hrc>
+#include <strings.hrc>
+#include <scmod.hxx>
+#include <globstr.hrc>
+#include <dputil.hxx>
 
 #include <vector>
 
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index ce61274909be..c0600fc8c26b 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -19,7 +19,7 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-#include "scitems.hxx"
+#include <scitems.hxx>
 #include <comphelper/string.hxx>
 #include <svx/colorbox.hxx>
 #include <svx/drawitem.hxx>
@@ -29,13 +29,13 @@
 #include <vcl/msgbox.hxx>
 #include <unotools/localedatawrapper.hxx>
 
-#include "global.hxx"
-#include "globstr.hrc"
-#include "tabvwsh.hxx"
-#include "viewdata.hxx"
-#include "document.hxx"
-#include "scresid.hxx"
-#include "scendlg.hxx"
+#include <global.hxx>
+#include <globstr.hrc>
+#include <tabvwsh.hxx>
+#include <viewdata.hxx>
+#include <document.hxx>
+#include <scresid.hxx>
+#include <scendlg.hxx>
 
 ScNewScenarioDlg::ScNewScenarioDlg( vcl::Window* pParent, const OUString& rName, bool bEdit, bool bSheetProtected)
 
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 6a8d144a66b7..293213e2cb66 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -27,23 +27,23 @@
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 
-#include "global.hxx"
-#include "scresid.hxx"
-#include "impex.hxx"
-#include "scuiasciiopt.hxx"
-#include "strings.hrc"
-#include "strings.hxx"
-#include "csvtablebox.hxx"
+#include <global.hxx>
+#include <scresid.hxx>
+#include <impex.hxx>
+#include <scuiasciiopt.hxx>
+#include <strings.hrc>
+#include <strings.hxx>
+#include <csvtablebox.hxx>
 #include <comphelper/string.hxx>
 #include <osl/thread.h>
 #include <rtl/tencinfo.h>
 #include <unotools/transliterationwrapper.hxx>
-#include "editutil.hxx"
+#include <editutil.hxx>
 
 #include <optutil.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include "miscuno.hxx"
+#include <miscuno.hxx>
 #include <tools/urlobj.hxx>
 
 //! TODO make dynamic
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index d994dcbdfb22..269d0e7e67f6 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -19,11 +19,11 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-#include "scuiimoptdlg.hxx"
-#include "tabvwsh.hxx"
-#include "scresid.hxx"
-#include "strings.hrc"
-#include "strings.hxx"
+#include <scuiimoptdlg.hxx>
+#include <tabvwsh.hxx>
+#include <scresid.hxx>
+#include <strings.hrc>
+#include <strings.hxx>
 #include <comphelper/string.hxx>
 #include <officecfg/Office/Calc.hxx>
 #include <osl/thread.h>
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 72cccc163506..fe441db8bd16 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -20,21 +20,21 @@
 #include <sfx2/dispatch.hxx>
 #include <vcl/idle.hxx>
 
-#include "uiitems.hxx"
-#include "rangenam.hxx"
-#include "dbdata.hxx"
-#include "reffact.hxx"
-#include "viewdata.hxx"
-#include "document.hxx"
-#include "docsh.hxx"
-#include "scresid.hxx"
+#include <uiitems.hxx>
+#include <rangenam.hxx>
+#include <dbdata.hxx>
+#include <reffact.hxx>
+#include <viewdata.hxx>
+#include <document.hxx>
+#include <docsh.hxx>
+#include <scresid.hxx>
 
-#include "foptmgr.hxx"
+#include <foptmgr.hxx>
 
-#include "globstr.hrc"
-#include "strings.hrc"
+#include <globstr.hrc>
+#include <strings.hrc>
 
-#include "filtdlg.hxx"
+#include <filtdlg.hxx>
 #include <vcl/msgbox.hxx>
 
 // DEFINE --------------------------------------------------------------------
diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx
index 877002169a13..7cfde8809a4b 100644
--- a/sc/source/ui/dbgui/sortdlg.cxx
+++ b/sc/source/ui/dbgui/sortdlg.cxx
@@ -20,9 +20,9 @@
 #undef SC_DLLIMPLEMENTATION
 
 #include <vcl/msgbox.hxx>
-#include "tpsort.hxx"
-#include "sortdlg.hxx"
-#include "scresid.hxx"
+#include <tpsort.hxx>
+#include <sortdlg.hxx>
+#include <scresid.hxx>
 
 ScSortDlg::ScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet)
     : SfxTabDialog(pParent, "SortDialog", "modules/scalc/ui/sortdialog.ui", pArgSet)
diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx
index 748782e9cf94..5bfc125a31f1 100644
--- a/sc/source/ui/dbgui/sortkeydlg.cxx
+++ b/sc/source/ui/dbgui/sortkeydlg.cxx
@@ -8,8 +8,8 @@
  */
 
 #include <memory>
-#include "sortkeydlg.hxx"
-#include "sortdlg.hxx"
+#include <sortkeydlg.hxx>
+#include <sortdlg.hxx>
 #include <vcl/layout.hxx>
 
 ScSortKeyItem::ScSortKeyItem(vcl::Window* pParent)
diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx
index 6fa2c27113aa..465f94694a01 100644
--- a/sc/source/ui/dbgui/subtdlg.cxx
+++ b/sc/source/ui/dbgui/subtdlg.cxx
@@ -19,9 +19,9 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-#include "tpsubt.hxx"
-#include "scresid.hxx"
-#include "subtdlg.hxx"
+#include <tpsubt.hxx>
+#include <scresid.hxx>
+#include <subtdlg.hxx>
 
 ScSubTotalDlg::ScSubTotalDlg(vcl::Window* pParent, const SfxItemSet* pArgSet)
     : SfxTabDialog(pParent, "SubTotalDialog",
diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx
index 7c93e0777130..b1d5f1ef7c44 100644
--- a/sc/source/ui/dbgui/textimportoptions.cxx
+++ b/sc/source/ui/dbgui/textimportoptions.cxx
@@ -19,7 +19,7 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-#include "textimportoptions.hxx"
+#include <textimportoptions.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/window.hxx>
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index cc62a5e1f839..7cdf814c77b0 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -26,25 +26,25 @@
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
 
-#include "scitems.hxx"
-#include "uiitems.hxx"
-#include "viewdata.hxx"
-#include "document.hxx"
-#include "global.hxx"
-#include "globalnames.hxx"
-#include "dbdata.hxx"
-#include "userlist.hxx"
-#include "rangeutl.hxx"
-#include "scresid.hxx"
-#include "sc.hrc"
-#include "strings.hrc"
-#include "globstr.hrc"
-
-#include "sortkeydlg.hxx"
-
-#include "sortdlg.hxx"
-
-#include "tpsort.hxx"
+#include <scitems.hxx>
+#include <uiitems.hxx>
+#include <viewdata.hxx>
+#include <document.hxx>
+#include <global.hxx>
+#include <globalnames.hxx>
+#include <dbdata.hxx>
+#include <userlist.hxx>
+#include <rangeutl.hxx>
+#include <scresid.hxx>
+#include <sc.hrc>
+#include <strings.hrc>
+#include <globstr.hrc>
+
+#include <sortkeydlg.hxx>
+
+#include <sortdlg.hxx>
+
+#include <tpsort.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 8b23073925e3..ca8bd54b6537 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -19,18 +19,18 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-#include "scitems.hxx"
-#include "uiitems.hxx"
-#include "global.hxx"
-#include "userlist.hxx"
-#include "viewdata.hxx"
-#include "document.hxx"
-#include "scresid.hxx"
-#include "sc.hrc"
-#include "strings.hrc"
-
-#include "subtdlg.hxx"
-#include "tpsubt.hxx"
+#include <scitems.hxx>
+#include <uiitems.hxx>
+#include <global.hxx>
+#include <userlist.hxx>
+#include <viewdata.hxx>
+#include <document.hxx>
+#include <scresid.hxx>
+#include <sc.hrc>
+#include <strings.hrc>
+
+#include <subtdlg.hxx>
+#include <tpsubt.hxx>
 #include <memory>
 
 // Subtotals group tabpage:
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 4a3a32c99e64..d4998e32492b 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -33,20 +33,20 @@
 #include <basic/sbmod.hxx>
 #include <sfx2/app.hxx>
 
-#include "scresid.hxx"
-#include "strings.hrc"
+#include <scresid.hxx>
+#include <strings.hrc>
 
-#include "stringutil.hxx"
-#include "validat.hxx"
-#include "validate.hxx"
-#include "compiler.hxx"
+#include <stringutil.hxx>
+#include <validat.hxx>
+#include <validate.hxx>
+#include <compiler.hxx>
 #include <formula/opcode.hxx>
 
 // cell range picker
-#include "tabvwsh.hxx"
+#include <tabvwsh.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/childwin.hxx>
-#include "reffact.hxx"
+#include <reffact.hxx>
 
 /*  Position indexes for "Allow" list box.
     They do not map directly to ScValidationMode and can safely be modified to