loplugin:includeform: cui

Change-Id: Ibd88b2ee4252733c5aeee97bec27f34b8e555364
author: Stephan Bergmann <sbergman@redhat.com> 2017-10-23 22:43:01 +0200
committer: Stephan Bergmann <sbergman@redhat.com> 2017-10-23 22:46:10 +0200
commit: 7182283c13238bdd3d6795f793f6c14b234585d4 (patch)
tree: 38ee352cdadbd5d739d85707a58da065a0d2ac3c /cui
parent: 4b27653a122acbbb38c800f0b1972f339e73d115 (diff)
111 files changed, 462 insertions, 462 deletions
diff --git a/cui/source/customize/CommandCategoryListBox.cxx b/cui/source/customize/CommandCategoryListBox.cxx
index d3c714c0db63..e307bd99f037 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "CommandCategoryListBox.hxx"
+#include <CommandCategoryListBox.hxx>
 #include <svtools/treelistentry.hxx>
 
 #include <com/sun/star/frame/XDispatchInformationProvider.hpp>
@@ -30,8 +30,8 @@
 #include <com/sun/star/util/SearchAlgorithms2.hpp>
 #include <unotools/textsearch.hxx>
 
-#include "dialmgr.hxx"
-#include "strings.hrc"
+#include <dialmgr.hxx>
+#include <strings.hrc>
 #include <comphelper/sequenceashashmap.hxx>
 #include <o3tl/make_unique.hxx>
 #include <i18nutil/searchopt.hxx>
diff --git a/cui/source/customize/SvxConfigPageHelper.cxx b/cui/source/customize/SvxConfigPageHelper.cxx
index 6f5b3889ca71..0a182e13ec1b 100644
--- a/cui/source/customize/SvxConfigPageHelper.cxx
+++ b/cui/source/customize/SvxConfigPageHelper.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "SvxConfigPageHelper.hxx"
+#include <SvxConfigPageHelper.hxx>
 
 static sal_Int16 theImageType =
     css::ui::ImageType::COLOR_NORMAL |
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx
index accd56afc670..aa885a206609 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <cassert>
 #include <stdlib.h>
@@ -47,19 +47,19 @@
 #include <svl/stritem.hxx>
 #include <svtools/miscopt.hxx>
 #include <svtools/svlbitm.hxx>
-#include "svtools/treelistentry.hxx"
-#include "svtools/viewdataentry.hxx"
+#include <svtools/treelistentry.hxx>
+#include <svtools/viewdataentry.hxx>
 #include <tools/diagnose_ex.h>
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include <algorithm>
 #include <strings.hrc>
-#include "helpids.h"
+#include <helpids.h>
 
-#include "acccfg.hxx"
-#include "cfg.hxx"
-#include "SvxMenuConfigPage.hxx"
-#include "SvxConfigPageHelper.hxx"
+#include <acccfg.hxx>
+#include <cfg.hxx>
+#include <SvxMenuConfigPage.hxx>
+#include <SvxConfigPageHelper.hxx>
 #include "eventdlg.hxx"
 #include <dialmgr.hxx>
 
@@ -96,11 +96,11 @@
 #include <com/sun/star/ui/ImageType.hpp>
 #include <com/sun/star/ui/theWindowStateConfiguration.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/util/thePathSettings.hpp>
 
-#include "dlgname.hxx"
+#include <dlgname.hxx>
 
 SvxMenuConfigPage::SvxMenuConfigPage(vcl::Window *pParent, const SfxItemSet& rSet, bool bIsMenuBar)
     : SvxConfigPage(pParent, rSet)
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx
index ceb00d6e4d29..72e4675b0336 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <cassert>
 #include <stdlib.h>
@@ -47,19 +47,19 @@
 #include <svl/stritem.hxx>
 #include <svtools/miscopt.hxx>
 #include <svtools/svlbitm.hxx>
-#include "svtools/treelistentry.hxx"
-#include "svtools/viewdataentry.hxx"
+#include <svtools/treelistentry.hxx>
+#include <svtools/viewdataentry.hxx>
 #include <tools/diagnose_ex.h>
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include <algorithm>
-#include "helpids.h"
-#include "strings.hrc"
+#include <helpids.h>
+#include <strings.hrc>
 
-#include "acccfg.hxx"
-#include "cfg.hxx"
-#include "SvxToolbarConfigPage.hxx"
-#include "SvxConfigPageHelper.hxx"
+#include <acccfg.hxx>
+#include <cfg.hxx>
+#include <SvxToolbarConfigPage.hxx>
+#include <SvxConfigPageHelper.hxx>
 #include "eventdlg.hxx"
 #include <dialmgr.hxx>
 
@@ -96,11 +96,11 @@
 #include <com/sun/star/ui/ImageType.hpp>
 #include <com/sun/star/ui/theWindowStateConfiguration.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/util/thePathSettings.hpp>
 
-#include "dlgname.hxx"
+#include <dlgname.hxx>
 
 SvxToolbarConfigPage::SvxToolbarConfigPage(vcl::Window *pParent, const SfxItemSet& rSet)
     : SvxConfigPage(pParent, rSet)
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 0186c798fff6..b314af956459 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -20,8 +20,8 @@
 
 // include own files
 
-#include "acccfg.hxx"
-#include "cfgutil.hxx"
+#include <acccfg.hxx>
+#include <cfgutil.hxx>
 #include <dialmgr.hxx>
 
 #include <sfx2/msg.hxx>
@@ -30,12 +30,12 @@
 #include <sfx2/minfitem.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <svl/stritem.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 
 #include <sal/macros.h>
 #include <vcl/builderfactory.hxx>
 
-#include "strings.hrc"
+#include <strings.hrc>
 #include <sfx2/strings.hrc>
 #include <svx/svxids.hrc>
 
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 3cb3a4b33547..d1ba1b61f5a5 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <cassert>
 #include <stdlib.h>
@@ -46,20 +46,20 @@
 #include <sfx2/filedlghelper.hxx>
 #include <svl/stritem.hxx>
 #include <svtools/svlbitm.hxx>
-#include "svtools/treelistentry.hxx"
-#include "svtools/viewdataentry.hxx"
+#include <svtools/treelistentry.hxx>
+#include <svtools/viewdataentry.hxx>
 #include <tools/diagnose_ex.h>
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include <algorithm>
-#include "helpids.h"
-#include "strings.hrc"
-
-#include "acccfg.hxx"
-#include "cfg.hxx"
-#include "SvxMenuConfigPage.hxx"
-#include "SvxToolbarConfigPage.hxx"
-#include "SvxConfigPageHelper.hxx"
+#include <helpids.h>
+#include <strings.hrc>
+
+#include <acccfg.hxx>
+#include <cfg.hxx>
+#include <SvxMenuConfigPage.hxx>
+#include <SvxToolbarConfigPage.hxx>
+#include <SvxConfigPageHelper.hxx>
 #include "eventdlg.hxx"
 #include <dialmgr.hxx>
 
@@ -92,12 +92,12 @@
 #include <com/sun/star/ui/ImageType.hpp>
 #include <com/sun/star/ui/theWindowStateConfiguration.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/util/thePathSettings.hpp>
 #include <comphelper/propertysequence.hxx>
 
-#include "dlgname.hxx"
+#include <dlgname.hxx>
 
 #define ENTRY_HEIGHT 16
 
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index fe02b8b0497a..131930aa6688 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "cfgutil.hxx"
-#include "cfg.hxx"
+#include <cfgutil.hxx>
+#include <cfg.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
@@ -36,7 +36,7 @@
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/ui/theUICategoryDescription.hpp>
 
-#include "helpids.h"
+#include <helpids.h>
 #include <basic/sbx.hxx>
 #include <basic/basicmanagerrepository.hxx>
 #include <basic/sbstar.hxx>
@@ -44,8 +44,8 @@
 #include <basic/sbmod.hxx>
 #include <basic/basmgr.hxx>
 #include <tools/urlobj.hxx>
-#include "strings.hrc"
-#include "bitmaps.hlst"
+#include <strings.hrc>
+#include <bitmaps.hlst>
 #include <sfx2/app.hxx>
 #include <sfx2/minfitem.hxx>
 #include <comphelper/documentinfo.hxx>
@@ -53,10 +53,10 @@
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/string.hxx>
 #include <svtools/imagemgr.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <unotools/configmgr.hxx>
-#include "dialmgr.hxx"
+#include <dialmgr.hxx>
 #include <svl/stritem.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/button.hxx>
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 187f60af132d..02b8961e033d 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -41,13 +41,13 @@
 #include <unotools/eventcfg.hxx>
 #include <svtools/treelistentry.hxx>
 
-#include "headertablistbox.hxx"
+#include <headertablistbox.hxx>
 #include "macropg_impl.hxx"
 
 #include <dialmgr.hxx>
-#include "helpids.h"
-#include "cfgutil.hxx"
-#include "cfg.hxx"
+#include <helpids.h>
+#include <cfgutil.hxx>
+#include <cfg.hxx>
 
 
 using namespace ::com::sun::star;
diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx
index 0b0a00b50976..697fd5042215 100644
--- a/cui/source/customize/eventdlg.hxx
+++ b/cui/source/customize/eventdlg.hxx
@@ -23,7 +23,7 @@
 
 #include <vcl/fixed.hxx>
 #include <sfx2/evntconf.hxx>
-#include "macropg.hxx"
+#include <macropg.hxx>
 
 #include <com/sun/star/frame/XFrame.hpp>
 
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 9c9a9fa060de..7d12fcb83e42 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -19,12 +19,12 @@
 
 #include <basic/basmgr.hxx>
 
-#include "macropg.hxx"
+#include <macropg.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/msgbox.hxx>
 #include <svtools/svmedit.hxx>
 #include <svtools/svlbitm.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <svl/eitem.hxx>
 #include <tools/diagnose_ex.h>
 #include <sfx2/app.hxx>
@@ -32,13 +32,13 @@
 #include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <dialmgr.hxx>
-#include "cfgutil.hxx"
-#include "cfg.hxx"
-#include "helpids.h"
-#include "headertablistbox.hxx"
+#include <cfgutil.hxx>
+#include <cfg.hxx>
+#include <helpids.h>
+#include <headertablistbox.hxx>
 #include "macropg_impl.hxx"
 #include <svx/dialogs.hrc>
-#include "strings.hrc"
+#include <strings.hrc>
 #include <vcl/builderfactory.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <o3tl/make_unique.hxx>
diff --git a/cui/source/dialogs/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx
index cc1b86c6a66a..7207f6c791e0 100644
--- a/cui/source/dialogs/SpellAttrib.cxx
+++ b/cui/source/dialogs/SpellAttrib.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <SpellAttrib.hxx>
+#include "SpellAttrib.hxx"
 #include <vcl/font.hxx>
 
 using namespace svx;
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 57358d89ad3a..a86acf2a5405 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -23,7 +23,7 @@
 #include <vcl/layout.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/settings.hxx>
-#include <SpellAttrib.hxx>
+#include "SpellAttrib.hxx"
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
 #include <svl/undo.hxx>
@@ -47,12 +47,12 @@
 #include <editeng/optitems.hxx>
 #include <editeng/svxenum.hxx>
 #include <svx/SpellDialogChildWindow.hxx>
-#include "SpellDialog.hxx"
+#include <SpellDialog.hxx>
 #include <svx/dlgutil.hxx>
-#include "optlingu.hxx"
+#include <optlingu.hxx>
 #include <dialmgr.hxx>
 #include <svx/svxerr.hxx>
-#include "treeopt.hxx"
+#include <treeopt.hxx>
 #include <svtools/langtab.hxx>
 #include <comphelper/anytostring.hxx>
 #include <cppuhelper/exc_hlp.hxx>
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 4342bcf495f6..a7d219407249 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -32,18 +32,18 @@
 #include <vcl/graphicfilter.hxx>
 #include <svtools/langhelp.hxx>
 
-#include "com/sun/star/system/SystemShellExecuteFlags.hpp"
-#include "com/sun/star/system/SystemShellExecute.hpp"
+#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
 #include <comphelper/processfactory.hxx>
-#include "comphelper/anytostring.hxx"
-#include "cppuhelper/exc_hlp.hxx"
-#include "cppuhelper/bootstrap.hxx"
+#include <comphelper/anytostring.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <cppuhelper/bootstrap.hxx>
 #include <basegfx/numeric/ftools.hxx>
 #include <com/sun/star/geometry/RealRectangle2D.hpp>
 #include <svtools/optionsdrawinglayer.hxx>
 
 #include <sfx2/sfxuno.hxx>
-#include "about.hxx"
+#include <about.hxx>
 #include <config_buildid.h>
 #include <sfx2/app.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 6444edaa8b98..504a65ddd7a8 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -43,8 +43,8 @@
 #include <svx/hexcolorcontrol.hxx>
 #include <sax/tools/converter.hxx>
 #include <basegfx/color/bcolortools.hxx>
-#include "dialmgr.hxx"
-#include "colorpicker.hxx"
+#include <dialmgr.hxx>
+#include <colorpicker.hxx>
 #include <cmath>
 #include <limits>
 #include <o3tl/typed_flags_set.hxx>
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 6ff10a51a510..1f039be57e85 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -39,14 +39,14 @@
 #include <comphelper/dispatchcommand.hxx>
 
 #include <dialmgr.hxx>
-#include "cuicharmap.hxx"
+#include <cuicharmap.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/app.hxx>
 #include <editeng/editids.hrc>
 #include <editeng/fontitem.hxx>
-#include "strings.hrc"
-#include "macroass.hxx"
+#include <strings.hrc>
+#include <macroass.hxx>
 #include <unicode/uchar.h>
 #include <unicode/utypes.h>
 
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 2f8830e93512..738698756d53 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -25,8 +25,8 @@
 #include <sfx2/app.hxx>
 #include <svx/fmsrccfg.hxx>
 #include <svx/fmsrcimp.hxx>
-#include "strings.hrc"
-#include "cuifmsearch.hxx"
+#include <strings.hrc>
+#include <cuifmsearch.hxx>
 #include <svx/srchdlg.hxx>
 #include <svl/cjkoptions.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 6b1c6a0411d0..5685b48d333a 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <algorithm>
 #include <cassert>
@@ -32,9 +32,9 @@
 #include <vcl/graphicfilter.hxx>
 #include <svx/gallery1.hxx>
 #include <svx/galtheme.hxx>
-#include "cuigaldlg.hxx"
-#include "helpids.h"
-#include "bitmaps.hlst"
+#include <cuigaldlg.hxx>
+#include <helpids.h>
+#include <bitmaps.hlst>
 #include <unotools/syslocale.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -46,8 +46,8 @@
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
 #include <sfx2/sfxuno.hxx>
-#include "dialmgr.hxx"
-#include "strings.hrc"
+#include <dialmgr.hxx>
+#include <strings.hrc>
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index e7e86b987d47..5ad65ac327ba 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -24,7 +24,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>
 #include <dialmgr.hxx>
-#include "cuigrfflt.hxx"
+#include <cuigrfflt.hxx>
 #include <svx/dialogs.hrc>
 
 
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index b9e61db2f334..cc301e5b47c2 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -22,14 +22,14 @@
 #include <o3tl/make_unique.hxx>
 #include <vcl/settings.hxx>
 #include <unotools/viewoptions.hxx>
-#include "cuihyperdlg.hxx"
-#include "hlinettp.hxx"
-#include "hlmailtp.hxx"
-#include "hldoctp.hxx"
-#include "hldocntp.hxx"
-#include "bitmaps.hlst"
+#include <cuihyperdlg.hxx>
+#include <hlinettp.hxx>
+#include <hlmailtp.hxx>
+#include <hldoctp.hxx>
+#include <hldocntp.hxx>
+#include <bitmaps.hlst>
 #include <svx/svxids.hrc>
-#include "strings.hrc"
+#include <strings.hrc>
 #include <vector>
 
 using ::com::sun::star::uno::Reference;
diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx
index bb358632e5f1..90ba66cd86ce 100644
--- a/cui/source/dialogs/cuiimapwnd.cxx
+++ b/cui/source/dialogs/cuiimapwnd.cxx
@@ -21,7 +21,7 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/help.hxx>
 #include <sfx2/sfxsids.hrc>
-#include "macroass.hxx"
+#include <macroass.hxx>
 #include <svtools/imaprect.hxx>
 #include <svtools/imapcirc.hxx>
 #include <svtools/imappoly.hxx>
diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx
index 868e0e984ec4..7458938dbde7 100644
--- a/cui/source/dialogs/cuitbxform.cxx
+++ b/cui/source/dialogs/cuitbxform.cxx
@@ -25,7 +25,7 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/fixed.hxx>
 #include <dialmgr.hxx>
-#include "cuitbxform.hxx"
+#include <cuitbxform.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
 
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index d9c2b376bf18..f04cf726d5a0 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <vcl/msgbox.hxx>
-#include "dlgname.hxx"
-#include "defdlgname.hxx"
+#include <dlgname.hxx>
+#include <defdlgname.hxx>
 #include <dialmgr.hxx>
 
 /*************************************************************************
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index ba8774d347c1..0fcc1fc1e17b 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hangulhanjadlg.hxx"
+#include <hangulhanjadlg.hxx>
 #include <dialmgr.hxx>
 
-#include "helpids.h"
-#include "strings.hrc"
+#include <helpids.h>
+#include <strings.hrc>
 
 #include <algorithm>
 #include <vcl/controllayout.hxx>
@@ -40,7 +40,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <svtools/svlbitm.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 
 #define HHC editeng::HangulHanjaConversion
 #define LINE_CNT        static_cast< sal_uInt16 >(2)
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 772360f4ab37..ed4732749268 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hldocntp.hxx"
+#include <hldocntp.hxx>
 #include <osl/file.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/docfac.hxx>
@@ -38,8 +38,8 @@
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
-#include "bitmaps.hlst"
-#include "strings.hrc"
+#include <bitmaps.hlst>
+#include <strings.hrc>
 
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::ui::dialogs;
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index a5811165c65a..e6317e76fc0d 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "cuihyperdlg.hxx"
+#include <cuihyperdlg.hxx>
 #include <osl/file.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
-#include "hldoctp.hxx"
-#include "hlmarkwn_def.hxx"
-#include "bitmaps.hlst"
+#include <hldoctp.hxx>
+#include <hlmarkwn_def.hxx>
+#include <bitmaps.hlst>
 
 sal_Char const sHash[]          = "#";
 sal_Char const sFileScheme[]    = INET_FILE_SCHEME;
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index fe3f1ddd1abb..23f2044aefc5 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -21,8 +21,8 @@
 #include <unotools/useroptions.hxx>
 #include <svl/adrparse.hxx>
 
-#include "hlinettp.hxx"
-#include "hlmarkwn_def.hxx"
+#include <hlinettp.hxx>
+#include <hlmarkwn_def.hxx>
 
 sal_Char const sAnonymous[]    = "anonymous";
 sal_Char const sFTPScheme[]    = INET_FTP_SCHEME;
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 6de31e614e0c..6d53adfa2ade 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -25,8 +25,8 @@
 #include <unotools/pathoptions.hxx>
 #include <unotools/moduleoptions.hxx>
 
-#include "hlmailtp.hxx"
-#include "bitmaps.hlst"
+#include <hlmailtp.hxx>
+#include <bitmaps.hlst>
 
 using namespace ::com::sun::star;
 
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 7b97044d26f4..579181dcea5f 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -37,11 +37,11 @@
 #include <com/sun/star/io/IOException.hpp>
 
 #include <toolkit/helper/vclunohelper.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 
 #include <strings.hrc>
-#include "hlmarkwn.hxx"
-#include "hltpbase.hxx"
+#include <hlmarkwn.hxx>
+#include <hltpbase.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index e09d52039381..2d41c1b664f5 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -28,9 +28,9 @@
 #include <sfx2/sfxsids.hrc>
 #include <svl/macitem.hxx>
 #include <ucbhelper/content.hxx>
-#include "cuihyperdlg.hxx"
-#include "hltpbase.hxx"
-#include "macroass.hxx"
+#include <cuihyperdlg.hxx>
+#include <hltpbase.hxx>
+#include <macroass.hxx>
 #include <svx/svxdlg.hxx>
 #include <strings.hrc>
 #include <bitmaps.hlst>
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 4661c1db37fa..29e8a5ce6f9d 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hyphen.hxx"
-#include "dialmgr.hxx"
+#include <hyphen.hxx>
+#include <dialmgr.hxx>
 
 #include <editeng/splwrap.hxx>
 #include <editeng/svxenum.hxx>
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 8c2f7a2f34e8..245a203e0c48 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -21,9 +21,9 @@
 
 #include <dialmgr.hxx>
 
-#include "iconcdlg.hxx"
+#include <iconcdlg.hxx>
 
-#include "helpids.h"
+#include <helpids.h>
 #include <unotools/viewoptions.hxx>
 #include <svtools/apearcfg.hxx>
 #include <vcl/mnemonic.hxx>
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 798a2398772f..1717629c4317 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <comphelper/processfactory.hxx>
 
-#include "insdlg.hxx"
+#include <insdlg.hxx>
 #include <dialmgr.hxx>
 #include <svtools/imagemgr.hxx>
 #include <svtools/strings.hrc>
@@ -54,7 +54,7 @@
 #include <svl/ownlist.hxx>
 #include <comphelper/seqstream.hxx>
 
-#include "strings.hrc"
+#include <strings.hrc>
 
 #include <osl/file.hxx>
 
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index 527070967e35..8bd342152d33 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -20,7 +20,7 @@
 #include <dialmgr.hxx>
 #include <svx/svxdlg.hxx>
 #include <strings.hrc>
-#include "insrc.hxx"
+#include <insrc.hxx>
 
 bool SvxInsRowColDlg::isInsertBefore() const
 {
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 59b9191b2a58..d5efc2a02f4b 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -19,7 +19,7 @@
 
 #include <linkdlg.hxx>
 #include <vcl/svapp.hxx>
-#include "helpids.h"
+#include <helpids.h>
 
 #include <tools/urlobj.hxx>
 #include <svtools/svmedit.hxx>
@@ -32,7 +32,7 @@
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
 #include <svtools/svtabbx.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 
 #include <strings.hrc>
 #include <sfx2/linkmgr.hxx>
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 9b521a28543a..69ecf270d382 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -24,7 +24,7 @@
 #include <vcl/msgbox.hxx>
 #include <sfx2/filedlghelper.hxx>
 
-#include "multipat.hxx"
+#include <multipat.hxx>
 #include <dialmgr.hxx>
 
 #include <strings.hrc>
@@ -34,7 +34,7 @@
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
 #include <unotools/pathoptions.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::ui::dialogs;
diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx
index d018d6161b2c..65af426fd0f1 100644
--- a/cui/source/dialogs/newtabledlg.cxx
+++ b/cui/source/dialogs/newtabledlg.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dialmgr.hxx"
-#include "newtabledlg.hxx"
+#include <dialmgr.hxx>
+#include <newtabledlg.hxx>
 
 SvxNewTableDialog::SvxNewTableDialog()
     : m_pDialog( VclPtr<ModalDialog>::Create( nullptr, "NewTableDialog", "cui/ui/newtabledialog.ui" ) )
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index f002b32ef474..21be42aec23d 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "passwdomdlg.hxx"
+#include <passwdomdlg.hxx>
 
-#include "strings.hrc"
-#include "dialmgr.hxx"
+#include <strings.hrc>
+#include <dialmgr.hxx>
 
 #include <sfx2/tabdlg.hxx>
 #include <vcl/fixed.hxx>
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 871b6475eff7..fd7e18b45446 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -30,10 +30,10 @@
 #include <svx/svxids.hrc>
 
 #include <svx/postattr.hxx>
-#include "postdlg.hxx"
+#include <postdlg.hxx>
 #include <dialmgr.hxx>
 
-#include "helpids.h"
+#include <helpids.h>
 
 // class SvxPostItDialog -------------------------------------------------
 
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index 552ed85c72ed..e75957c1848b 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "screenshotannotationdlg.hxx"
+#include <screenshotannotationdlg.hxx>
 
-#include "strings.hrc"
-#include "dialmgr.hxx"
+#include <strings.hrc>
+#include <dialmgr.hxx>
 
 #include <basegfx/range/b2irange.hxx>
 #include <cppuhelper/bootstrap.hxx>
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 3d24e337251e..2df5cd25e516 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -28,9 +28,9 @@
 
 #include <strings.hrc>
 #include <bitmaps.hlst>
-#include "scriptdlg.hxx"
+#include <scriptdlg.hxx>
 #include <dialmgr.hxx>
-#include "cfgutil.hxx"
+#include <cfgutil.hxx>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/script/provider/ScriptFrameworkErrorException.hpp>
@@ -57,7 +57,7 @@
 
 #include <basic/sbx.hxx>
 #include <svtools/imagemgr.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <tools/urlobj.hxx>
 #include <vector>
 #include <algorithm>
diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx
index f7987988a5b5..7011a4de1d9c 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -19,11 +19,11 @@
 
 #include <svl/cjkoptions.hxx>
 #include <svx/flagsdef.hxx>
-#include "sdrcelldlg.hxx"
-#include "dialmgr.hxx"
-#include "cuitabarea.hxx"
-#include "svx/svdmodel.hxx"
-#include "border.hxx"
+#include <sdrcelldlg.hxx>
+#include <dialmgr.hxx>
+#include <cuitabarea.hxx>
+#include <svx/svdmodel.hxx>
+#include <border.hxx>
 #include <svx/dialogs.hrc>
 
 SvxFormatCellsDialog::SvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel const * pModel )
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index cc1078e8d7cb..e01337bc5f58 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "showcols.hxx"
-#include "strings.hrc"
+#include <showcols.hxx>
+#include <strings.hrc>
 
 #include <dialmgr.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx
index 8a4a4bc8d4ff..9386d171196f 100644
--- a/cui/source/dialogs/splitcelldlg.cxx
+++ b/cui/source/dialogs/splitcelldlg.cxx
@@ -20,8 +20,8 @@
 #include <sfx2/dispatch.hxx>
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
-#include "dialmgr.hxx"
-#include "splitcelldlg.hxx"
+#include <dialmgr.hxx>
+#include <splitcelldlg.hxx>
 
 namespace {
     class NoApplyDialog : public SvxStandardDialog
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 7af454f67fb3..e5cfd54656f4 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "srchxtra.hxx"
+#include <srchxtra.hxx>
 #include <vcl/msgbox.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/whiter.hxx>
@@ -26,14 +26,14 @@
 #include <svx/dialmgr.hxx>
 #include <svx/strarray.hxx>
 #include <editeng/flstitem.hxx>
-#include "chardlg.hxx"
-#include "paragrph.hxx"
+#include <chardlg.hxx>
+#include <paragrph.hxx>
 #include <dialmgr.hxx>
-#include "backgrnd.hxx"
+#include <backgrnd.hxx>
 #include <svx/dialogs.hrc>
 #include <tools/resary.hxx>
 #include <rtl/strbuf.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 
 SvxSearchFormatDialog::SvxSearchFormatDialog(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxTabDialog(pParent, "SearchFormatDialog", "cui/ui/searchformatdialog.ui", &rSet)
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 6efcaa29d171..96d8ff26e496 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -17,17 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "thesdlg.hxx"
+#include <thesdlg.hxx>
 #include "thesdlg_impl.hxx"
-#include "strings.hrc"
-#include "dialmgr.hxx"
+#include <strings.hrc>
+#include <dialmgr.hxx>
 
 #include <svl/lngmisc.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <svtools/svlbitm.hxx>
 #include <svtools/treelistbox.hxx>
-#include "svtools/treelistentry.hxx"
-#include "svtools/viewdataentry.hxx"
+#include <svtools/treelistentry.hxx>
+#include <svtools/viewdataentry.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx
index ebd521a393c0..1b283c3c254d 100644
--- a/cui/source/dialogs/thesdlg_impl.hxx
+++ b/cui/source/dialogs/thesdlg_impl.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CUI_SOURCE_DIALOGS_THESDLG_IMPL_HXX
 #define INCLUDED_CUI_SOURCE_DIALOGS_THESDLG_IMPL_HXX
 
-#include "thesdlg.hxx"
+#include <thesdlg.hxx>
 
 #include <svtools/ehdl.hxx>
 #include <svtools/svlbitm.hxx>
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 056b757b357e..35dd7c56379f 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -22,7 +22,7 @@
 #include <sfx2/objsh.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/msgbox.hxx>
-#include "zoom.hxx"
+#include <zoom.hxx>
 #include <sfx2/zoomitem.hxx>
 #include <svx/viewlayoutitem.hxx>
 #include <dialmgr.hxx>
diff --git a/cui/source/factory/cuiexp.cxx b/cui/source/factory/cuiexp.cxx
index 7f558b73c57a..94c5a165815d 100644
--- a/cui/source/factory/cuiexp.cxx
+++ b/cui/source/factory/cuiexp.cxx
@@ -17,38 +17,38 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sfx2/basedlgs.hxx"
-#include "cuigaldlg.hxx"
-#include "hlmarkwn.hxx"
-#include "srchxtra.hxx"
-#include "cuisrchdlg.hxx"
-#include "transfrm.hxx"
-#include "labdlg.hxx"
-#include "cuitbxform.hxx"
-#include "optdict.hxx"
-#include "dlgname.hxx"
-#include "cuiimapwnd.hxx"
-#include "multipat.hxx"
-#include "cuifmsearch.hxx"
-#include "cuigrfflt.hxx"
-#include "cuitabarea.hxx"
-#include "insdlg.hxx"
-#include "pastedlg.hxx"
-#include "linkdlg.hxx"
-#include "postdlg.hxx"
-#include "passwdomdlg.hxx"
-#include "screenshotannotationdlg.hxx"
-#include "cuihyperdlg.hxx"
-#include "cfgutil.hxx"
-#include "SpellDialog.hxx"
-#include "zoom.hxx"
-#include "showcols.hxx"
-#include "hyphen.hxx"
-#include "thesdlg.hxx"
-#include "hangulhanjadlg.hxx"
-#include "dstribut.hxx"
+#include <sfx2/basedlgs.hxx>
+#include <cuigaldlg.hxx>
+#include <hlmarkwn.hxx>
+#include <srchxtra.hxx>
+#include <cuisrchdlg.hxx>
+#include <transfrm.hxx>
+#include <labdlg.hxx>
+#include <cuitbxform.hxx>
+#include <optdict.hxx>
+#include <dlgname.hxx>
+#include <cuiimapwnd.hxx>
+#include <multipat.hxx>
+#include <cuifmsearch.hxx>
+#include <cuigrfflt.hxx>
+#include <cuitabarea.hxx>
+#include <insdlg.hxx>
+#include <pastedlg.hxx>
+#include <linkdlg.hxx>
+#include <postdlg.hxx>
+#include <passwdomdlg.hxx>
+#include <screenshotannotationdlg.hxx>
+#include <cuihyperdlg.hxx>
+#include <cfgutil.hxx>
+#include <SpellDialog.hxx>
+#include <zoom.hxx>
+#include <showcols.hxx>
+#include <hyphen.hxx>
+#include <thesdlg.hxx>
+#include <hangulhanjadlg.hxx>
+#include <dstribut.hxx>
 #include "dlgfact.hxx"
-#include "sal/types.h"
+#include <sal/types.h>
 
 namespace cui
 {
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index d49a73467796..33c39a69f7bb 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "align.hxx"
+#include <align.hxx>
 #include "dlgfact.hxx"
 
 #include <sfx2/app.hxx>
@@ -25,67 +25,67 @@
 #include <sfx2/pageids.hxx>
 #include <sfx2/request.hxx>
 #include <svx/dialogs.hrc>
-#include "numfmt.hxx"
-#include "splitcelldlg.hxx"
-#include "dstribut.hxx"
-#include "cuiimapwnd.hxx"
-#include "hlmarkwn.hxx"
-#include "cuicharmap.hxx"
-#include "srchxtra.hxx"
-#include "textanim.hxx"
-#include "autocdlg.hxx"
-#include "treeopt.hxx"
-#include "labdlg.hxx"
-#include "hangulhanjadlg.hxx"
-#include "showcols.hxx"
-#include "zoom.hxx"
-#include "cuigaldlg.hxx"
-#include "transfrm.hxx"
-#include "bbdlg.hxx"
-#include "cuisrchdlg.hxx"
-#include "cuitbxform.hxx"
-#include "optdict.hxx"
-#include "dlgname.hxx"
-#include "multipat.hxx"
-#include "cuihyperdlg.hxx"
-#include "cuifmsearch.hxx"
-#include "cuigrfflt.hxx"
-#include "cuitabarea.hxx"
-#include "cuitabline.hxx"
-#include "measure.hxx"
-#include "connect.hxx"
-#include "dbregister.hxx"
-#include "cuioptgenrl.hxx"
-#include "optasian.hxx"
-#include "insdlg.hxx"
-#include "pastedlg.hxx"
-#include "linkdlg.hxx"
-#include "SpellDialog.hxx"
-#include "cfg.hxx"
-#include "numpages.hxx"
-#include "paragrph.hxx"
-#include "tabstpge.hxx"
-#include "textattr.hxx"
-#include "backgrnd.hxx"
-#include "border.hxx"
-#include "chardlg.hxx"
-#include "page.hxx"
-#include "postdlg.hxx"
-#include "grfpage.hxx"
-#include "scriptdlg.hxx"
-#include "cfgutil.hxx"
-#include "macropg.hxx"
-#include "sdrcelldlg.hxx"
-#include "newtabledlg.hxx"
-#include "macroass.hxx"
-#include "acccfg.hxx"
-#include "insrc.hxx"
-#include "passwdomdlg.hxx"
-#include "screenshotannotationdlg.hxx"
-#include "hyphen.hxx"
-#include "thesdlg.hxx"
-#include "about.hxx"
-#include "dialmgr.hxx"
+#include <numfmt.hxx>
+#include <splitcelldlg.hxx>
+#include <dstribut.hxx>
+#include <cuiimapwnd.hxx>
+#include <hlmarkwn.hxx>
+#include <cuicharmap.hxx>
+#include <srchxtra.hxx>
+#include <textanim.hxx>
+#include <autocdlg.hxx>
+#include <treeopt.hxx>
+#include <labdlg.hxx>
+#include <hangulhanjadlg.hxx>
+#include <showcols.hxx>
+#include <zoom.hxx>
+#include <cuigaldlg.hxx>
+#include <transfrm.hxx>
+#include <bbdlg.hxx>
+#include <cuisrchdlg.hxx>
+#include <cuitbxform.hxx>
+#include <optdict.hxx>
+#include <dlgname.hxx>
+#include <multipat.hxx>
+#include <cuihyperdlg.hxx>
+#include <cuifmsearch.hxx>
+#include <cuigrfflt.hxx>
+#include <cuitabarea.hxx>
+#include <cuitabline.hxx>
+#include <measure.hxx>
+#include <connect.hxx>
+#include <dbregister.hxx>
+#include <cuioptgenrl.hxx>
+#include <optasian.hxx>
+#include <insdlg.hxx>
+#include <pastedlg.hxx>
+#include <linkdlg.hxx>
+#include <SpellDialog.hxx>
+#include <cfg.hxx>
+#include <numpages.hxx>
+#include <paragrph.hxx>
+#include <tabstpge.hxx>
+#include <textattr.hxx>
+#include <backgrnd.hxx>
+#include <border.hxx>
+#include <chardlg.hxx>
+#include <page.hxx>
+#include <postdlg.hxx>
+#include <grfpage.hxx>
+#include <scriptdlg.hxx>
+#include <cfgutil.hxx>
+#include <macropg.hxx>
+#include <sdrcelldlg.hxx>
+#include <newtabledlg.hxx>
+#include <macroass.hxx>
+#include <acccfg.hxx>
+#include <insrc.hxx>
+#include <passwdomdlg.hxx>
+#include <screenshotannotationdlg.hxx>
+#include <hyphen.hxx>
+#include <thesdlg.hxx>
+#include <about.hxx>
+#include <dialmgr.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::frame;
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index a6ce3a9ac050..589478a1135e 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -23,7 +23,7 @@
 #include <svx/zoom_def.hxx>
 #include <com/sun/star/container/XNameReplace.hpp>
 
-#include "tools/link.hxx"
+#include <tools/link.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
 
 class SfxTabDialog;
diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx
index e23077a0342b..d11370702024 100644
--- a/cui/source/factory/init.cxx
+++ b/cui/source/factory/init.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <vcl/msgbox.hxx>
-#include "cuicharmap.hxx"
+#include <cuicharmap.hxx>
 
 // hook to call special character dialog for edits
 // caution: needs C-Linkage since dynamically loaded via symbol name
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index d4fdaa5ed54b..55e4402b2ced 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CUI_SOURCE_INC_CUIGALDLG_HXX
 #define INCLUDED_CUI_SOURCE_INC_CUIGALDLG_HXX
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <salhelper/thread.hxx>
 #include <vcl/dialog.hxx>
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index ef2661a7187c..b9d410f0a7cf 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -36,7 +36,7 @@
 #include <svtools/inettbc.hxx>
 #include <vcl/timer.hxx>
 
-#include <dialmgr.hxx>
+#include "dialmgr.hxx"
 #include <sfx2/docfile.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
 #include "helpids.h"
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index d7b631f8c21e..8fe19005b034 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CUI_SOURCE_INC_MACROASS_HXX
 #define INCLUDED_CUI_SOURCE_INC_MACROASS_HXX
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/tabdlg.hxx>
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 1a222613bcb4..3cd712174f75 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -11,10 +11,10 @@
 #include <osl/file.hxx>
 #include <osl/security.hxx>
 #include <osl/thread.h>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <unotools/securityoptions.hxx>
 #include "certpath.hxx"
-#include "dialmgr.hxx"
+#include <dialmgr.hxx>
 
 #include <com/sun/star/mozilla/MozillaBootstrap.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx
index 528f4fbc79e0..ff373df5a996 100644
--- a/cui/source/options/certpath.hxx
+++ b/cui/source/options/certpath.hxx
@@ -14,7 +14,7 @@
 #include <svtools/simptabl.hxx>
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
-#include "radiobtnbox.hxx"
+#include <radiobtnbox.hxx>
 
 class CertPathDialog : public ModalDialog
 {
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index e076e3ca2311..5e5da2593100 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -23,7 +23,7 @@
 #include <vcl/builderfactory.hxx>
 #include "connpoolsettings.hxx"
 #include <svl/eitem.hxx>
-#include "helpids.h"
+#include <helpids.h>
 #include <strings.hrc>
 #include <dialmgr.hxx>
 
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index 8ee9ac426723..5dd6a16d9417 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -31,15 +31,15 @@
 #include <sfx2/basedlgs.hxx>
 #include <svl/cjkoptions.hxx>
 
-#include "cuisrchdlg.hxx"
+#include <cuisrchdlg.hxx>
 
 #include <svl/srchitem.hxx>
 #include <svx/pageitem.hxx>
 #include <dialmgr.hxx>
 #include <svx/dlgutil.hxx>
-#include <optjsearch.hxx>
+#include "optjsearch.hxx"
 #include <editeng/brushitem.hxx>
-#include "backgrnd.hxx"
+#include <backgrnd.hxx>
 
 
 // class SvxJSearchOptionsDialog -----------------------------------------
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index de9900e33372..fc02372cdd48 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbregister.hxx"
+#include <dbregister.hxx>
 #include "dbregistersettings.hxx"
 #include "connpooloptions.hxx"
 #include <svl/filenotation.hxx>
-#include "helpids.h"
+#include <helpids.h>
 #include <svtools/editbrowsebox.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <strings.hrc>
 #include <bitmaps.hlst>
 #include <vcl/field.hxx>
diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx
index 4de9bc15d70f..1a0e7786dae8 100644
--- a/cui/source/options/dbregisterednamesconfig.cxx
+++ b/cui/source/options/dbregisterednamesconfig.cxx
@@ -20,7 +20,7 @@
 #include "connpooloptions.hxx"
 #include "dbregisterednamesconfig.hxx"
 #include "dbregistersettings.hxx"
-#include "svx/svxids.hrc"
+#include <svx/svxids.hrc>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/sdb/DatabaseContext.hpp>
 #include <comphelper/extract.hxx>
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index b1ef2241f17b..eb67957b9588 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <officecfg/Office/Common.hxx>
 #include <svtools/ctrltool.hxx>
@@ -27,7 +27,7 @@
 #include <svtools/fontsubstconfig.hxx>
 #include "fontsubs.hxx"
 #include <dialmgr.hxx>
-#include "helpids.h"
+#include <helpids.h>
 #include <o3tl/make_unique.hxx>
 
 /*********************************************************************/
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index 517fb17a683f..6a99330e0937 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <optaccessibility.hxx>
+#include "optaccessibility.hxx"
 #include <dialmgr.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index e546069a679a..c04584f08bb4 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -34,7 +34,7 @@
 
 #include <linguistic/misc.hxx>
 #include <strings.hrc>
-#include "optdict.hxx"
+#include <optdict.hxx>
 #include <dialmgr.hxx>
 #include <svx/svxerr.hxx>
 
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 067cb331cebd..478aacb4bd89 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -21,12 +21,12 @@
 #include <unotools/moduleoptions.hxx>
 #include <unotools/fltrcfg.hxx>
 #include "optfltr.hxx"
-#include "helpids.h"
-#include "strings.hrc"
+#include <helpids.h>
+#include <strings.hrc>
 #include <dialmgr.hxx>
 
-#include "svtools/svlbitm.hxx"
-#include "svtools/treelistentry.hxx"
+#include <svtools/svlbitm.hxx>
+#include <svtools/treelistentry.hxx>
 
 enum MSFltrPg2_CheckBoxEntries {
     Math,
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index e34c7e7a35c6..94eb3931bc56 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -47,13 +47,13 @@
 #include <svtools/langtab.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <unotools/configmgr.hxx>
-#include "cuioptgenrl.hxx"
-#include "optpath.hxx"
+#include <cuioptgenrl.hxx>
+#include <optpath.hxx>
 #include "optsave.hxx"
-#include "optlingu.hxx"
+#include <optlingu.hxx>
 #include <svx/xpool.hxx>
 #include <svx/dlgutil.hxx>
-#include "cuitabarea.hxx"
+#include <cuitabarea.hxx>
 #include <editeng/unolingu.hxx>
 #include <editeng/langitem.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 7f9e975007eb..a4465ad01487 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -27,7 +27,7 @@
 #include <vcl/settings.hxx>
 
 #include <unotools/useroptions.hxx>
-#include "cuioptgenrl.hxx"
+#include <cuioptgenrl.hxx>
 #include <dialmgr.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/svxids.hrc>
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 2b47d835870f..c0023516bd71 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -20,7 +20,7 @@
 #include <svtools/langtab.hxx>
 #include <svtools/htmlcfg.hxx>
 #include "opthtml.hxx"
-#include "helpids.h"
+#include <helpids.h>
 #include <dialmgr.hxx>
 #include <sal/macros.h>
 
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index d68e04cc3de5..66c75166f03e 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -49,7 +49,7 @@
 #include <dialmgr.hxx>
 #include "optinet2.hxx"
 #include <svx/svxdlg.hxx>
-#include "helpids.h"
+#include <helpids.h>
 #include <svx/ofaitem.hxx>
 #include <sfx2/htmlmode.hxx>
 #include <svx/svxids.hrc>
@@ -83,9 +83,9 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
-#include "com/sun/star/task/PasswordContainer.hpp"
-#include "com/sun/star/task/XPasswordContainer2.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
+#include <com/sun/star/task/PasswordContainer.hpp>
+#include <com/sun/star/task/XPasswordContainer2.hpp>
 #include "securityoptions.hxx"
 #include "webconninfo.hxx"
 #include "certpath.hxx"
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index f448511d3e43..b226fc143739 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -31,7 +31,7 @@
 #include <officecfg/Office/Common.hxx>
 #include <svtools/miscopt.hxx>
 
-#include "helpids.h"
+#include <helpids.h>
 #include <strings.hrc>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
@@ -41,7 +41,7 @@
 #include <unotools/pathoptions.hxx>
 #include <svtools/imagemgr.hxx>
 #include <svtools/restartdialog.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/inputdlg.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 064cacce64e0..0e2d7a62dee5 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
 #include <svtools/dialogclosedlistener.hxx>
 #include <svtools/simptabl.hxx>
-#include "radiobtnbox.hxx"
+#include <radiobtnbox.hxx>
 
 // forward ---------------------------------------------------------------
 
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index 0c709cc57aa8..c09324f25b62 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -20,7 +20,7 @@
 #include <unotools/searchopt.hxx>
 #include <i18nutil/transliteration.hxx>
 #include <dialmgr.hxx>
-#include <optjsearch.hxx>
+#include "optjsearch.hxx"
 
 using namespace com::sun::star::i18n;
 
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 6a7572d32821..a606652eb078 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -45,7 +45,7 @@
 #include <unotools/extendedsecurityoptions.hxx>
 #include <svtools/svlbitm.hxx>
 #include <svtools/treelistbox.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <svtools/langhelp.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
@@ -54,9 +54,9 @@
 
 #include <svx/svxdlg.hxx>
 #include <editeng/optitems.hxx>
-#include "optlingu.hxx"
+#include <optlingu.hxx>
 #include <dialmgr.hxx>
-#include "helpids.h"
+#include <helpids.h>
 #include <strings.hrc>
 
 #include <ucbhelper/content.hxx>
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 96034786c0b5..ffe3d530f9c8 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -23,7 +23,7 @@
 #include <sfx2/app.hxx>
 #include <svl/aeitem.hxx>
 #include <svtools/svtabbx.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/defaultoptions.hxx>
@@ -32,10 +32,10 @@
 #include <unotools/moduleoptions.hxx>
 #include <unotools/viewoptions.hxx>
 
-#include "optpath.hxx"
+#include <optpath.hxx>
 #include <dialmgr.hxx>
-#include "helpids.h"
-#include "strings.hrc"
+#include <helpids.h>
+#include <strings.hrc>
 #include <comphelper/configuration.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index f14a3a05cb0a..a8f2c3952c37 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -28,14 +28,14 @@
 #include <vcl/graphicfilter.hxx>
 #include <vcl/mnemonic.hxx>
 #include <dialmgr.hxx>
-#include "strings.hrc"
-#include "personalization.hrc"
+#include <strings.hrc>
+#include <personalization.hrc>
 
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 #include <com/sun/star/xml/sax/XParser.hpp>
 #include <com/sun/star/xml/sax/Parser.hpp>
-#include "ucbhelper/content.hxx"
+#include <ucbhelper/content.hxx>
 #include <comphelper/simplefileaccessinteraction.hxx>
 
 #define MAX_RESULTS 9
diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx
index 4e304a96a932..b0cda584b642 100644
--- a/cui/source/options/radiobtnbox.cxx
+++ b/cui/source/options/radiobtnbox.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "radiobtnbox.hxx"
+#include <radiobtnbox.hxx>
 #include <dialmgr.hxx>
 
-#include "svtools/svlbitm.hxx"
+#include <svtools/svlbitm.hxx>
 
 namespace svx {
 
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 32ad04310ffe..07f469b2b307 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -22,22 +22,22 @@
 
 #include <svx/dialogs.hrc>
 
-#include "strings.hrc"
-#include "treeopt.hrc"
-#include "helpids.h"
+#include <strings.hrc>
+#include <treeopt.hrc>
+#include <helpids.h>
 
 #include "cfgchart.hxx"
 #include "connpoolconfig.hxx"
 #include "connpooloptions.hxx"
-#include "cuioptgenrl.hxx"
-#include "cuitabarea.hxx"
-#include "dbregister.hxx"
+#include <cuioptgenrl.hxx>
+#include <cuitabarea.hxx>
+#include <dbregister.hxx>
 #include "dbregisterednamesconfig.hxx"
-#include "dialmgr.hxx"
+#include <dialmgr.hxx>
 #include "fontsubs.hxx"
 #include "optaboutconfig.hxx"
 #include "optaccessibility.hxx"
-#include "optasian.hxx"
+#include <optasian.hxx>
 #include "optchart.hxx"
 #include "optcolor.hxx"
 #include "optctl.hxx"
@@ -47,15 +47,15 @@
 #include "optinet2.hxx"
 #include "optjava.hxx"
 #include "optjsearch.hxx"
-#include "optlingu.hxx"
+#include <optlingu.hxx>
 #if HAVE_FEATURE_OPENCL
 #include "optopencl.hxx"
 #endif
-#include "optpath.hxx"
+#include <optpath.hxx>
 #include "optsave.hxx"
 #include "optupdt.hxx"
 #include "personalization.hxx"
-#include "treeopt.hxx"
+#include <treeopt.hxx>
 #include "optbasic.hxx"
 
 #include <com/sun/star/awt/XContainerWindowEventHandler.hpp>
@@ -104,7 +104,7 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/waitobj.hxx>
 #include <vcl/settings.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 
 #ifdef LINUX
 #include <sys/stat.h>
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index afa01a2c7a52..82dfb735dc8a 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/task/XPasswordContainer2.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/docpasswordrequest.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <vcl/layout.hxx>
 
 using namespace ::com::sun::star;
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 18d52e7d0a44..5f4a2fee3f46 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "align.hxx"
+#include <align.hxx>
 
 #include <editeng/svxenum.hxx>
 #include <svx/dialogs.hrc>
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index e1a8af09e7dd..9b356317e54a 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -47,12 +47,12 @@
 #include <rtl/strbuf.hxx>
 #include <o3tl/make_unique.hxx>
 
-#include "autocdlg.hxx"
-#include "helpids.h"
+#include <autocdlg.hxx>
+#include <helpids.h>
 #include <editeng/acorrcfg.hxx>
 #include <editeng/svxacorr.hxx>
-#include "cuicharmap.hxx"
-#include "strings.hrc"
+#include <cuicharmap.hxx>
+#include <strings.hrc>
 #include <editeng/unolingu.hxx>
 #include <dialmgr.hxx>
 #include <svx/svxids.hrc>
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 6d483aecb0f1..1c2afbed0409 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -38,7 +38,7 @@
 
 #include <editeng/brushitem.hxx>
 #include <editeng/colritem.hxx>
-#include "backgrnd.hxx"
+#include <backgrnd.hxx>
 
 #include <svx/xtable.hxx>
 #include <sfx2/opengrf.hxx>
diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx
index 69a7e4eef93c..0f2a229093c7 100644
--- a/cui/source/tabpages/bbdlg.cxx
+++ b/cui/source/tabpages/bbdlg.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "bbdlg.hxx"
-#include "border.hxx"
-#include "backgrnd.hxx"
-#include "svx/svxids.hrc"
-#include "cuitabarea.hxx"
+#include <bbdlg.hxx>
+#include <border.hxx>
+#include <backgrnd.hxx>
+#include <svx/svxids.hrc>
+#include <cuitabarea.hxx>
 
 SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(vcl::Window *pParent,
     const SfxItemSet& rCoreSet,
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index f2b3e8cfe99c..5045f838a9ee 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -26,19 +26,19 @@
 
 #include <strings.hrc>
 #include <bitmaps.hlst>
-#include "helpids.h"
+#include <helpids.h>
 
 #include <svx/xtable.hxx>
 #include <svx/drawitem.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/shaditem.hxx>
-#include "border.hxx"
+#include <border.hxx>
 #include <svx/dlgutil.hxx>
 #include <dialmgr.hxx>
 #include <sfx2/htmlmode.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
-#include "svx/flagsdef.hxx"
+#include <svx/flagsdef.hxx>
 #include <sfx2/request.hxx>
 #include <svl/intitem.hxx>
 #include <svl/ilstitem.hxx>
diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx
index 01ccd70dedb2..90b6b2f1b41e 100644
--- a/cui/source/tabpages/borderconn.cxx
+++ b/cui/source/tabpages/borderconn.cxx
@@ -20,7 +20,7 @@
 #include "borderconn.hxx"
 #include <svx/frmsel.hxx>
 #include <svx/svxids.hrc>
-#include "editeng/lineitem.hxx"
+#include <editeng/lineitem.hxx>
 #include <editeng/boxitem.hxx>
 #include <svx/algitem.hxx>
 #include <svx/colorbox.hxx>
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index b1abbe7c39c2..06f8616ded00 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -33,8 +33,8 @@
 #include <svtools/unitconv.hxx>
 #include <svl/languageoptions.hxx>
 #include <svx/xtable.hxx>
-#include "chardlg.hxx"
-#include "editeng/fontitem.hxx"
+#include <chardlg.hxx>
+#include <editeng/fontitem.hxx>
 #include <editeng/postitem.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/crossedoutitem.hxx>
@@ -49,15 +49,15 @@
 #include <editeng/cmapitem.hxx>
 #include <editeng/kernitem.hxx>
 #include <editeng/blinkitem.hxx>
-#include "editeng/flstitem.hxx"
+#include <editeng/flstitem.hxx>
 #include <editeng/autokernitem.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/colritem.hxx>
-#include "svx/drawitem.hxx"
-#include "svx/dlgutil.hxx"
+#include <svx/drawitem.hxx>
+#include <svx/dlgutil.hxx>
 #include <dialmgr.hxx>
 #include <sfx2/htmlmode.hxx>
-#include "cuicharmap.hxx"
+#include <cuicharmap.hxx>
 #include "chardlg.h"
 #include <editeng/emphasismarkitem.hxx>
 #include <editeng/charreliefitem.hxx>
@@ -71,7 +71,7 @@
 #include <strings.hrc>
 #include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
-#include "svx/flagsdef.hxx"
+#include <svx/flagsdef.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 25b1ecd170d9..7aa82e5bad6f 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -34,7 +34,7 @@
 #include <svx/sxelditm.hxx>
 #include <svx/sxenditm.hxx>
 
-#include "connect.hxx"
+#include <connect.hxx>
 
 const sal_uInt16 SvxConnectionPage::pRanges[] =
 {
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index fd58cda4fcd1..d6e9c338d2a8 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <sfx2/basedlgs.hxx>
-#include "dstribut.hxx"
+#include <dstribut.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/svddef.hxx>
 #include <dialmgr.hxx>
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 02f5a1912156..dfc7e0f74342 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -32,9 +32,9 @@
 #include <svx/sxcllitm.hxx>
 #include <svx/sxctitm.hxx>
 
-#include "svx/dlgutil.hxx"
-#include "labdlg.hxx"
-#include "transfrm.hxx"
+#include <svx/dlgutil.hxx>
+#include <labdlg.hxx>
+#include <transfrm.hxx>
 
 // define ----------------------------------------------------------------
 
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index a1a576b1b064..8aa7f60aa7ba 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "macroass.hxx"
+#include <macroass.hxx>
 
 #include <basic/basmgr.hxx>
 #include <comphelper/string.hxx>
@@ -26,14 +26,14 @@
 #include <svx/dialogs.hrc>
 #include <svtools/svmedit.hxx>
 #include <vcl/idle.hxx>
-#include "cfgutil.hxx"
+#include <cfgutil.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/evntconf.hxx>
 #include <sfx2/objsh.hxx>
 #include <vcl/fixed.hxx>
-#include "headertablistbox.hxx"
-#include "svtools/svlbitm.hxx"
-#include "svtools/treelistentry.hxx"
+#include <headertablistbox.hxx>
+#include <svtools/svlbitm.hxx>
+#include <svtools/treelistentry.hxx>
 #include <o3tl/make_unique.hxx>
 
 using ::com::sun::star::uno::Reference;
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 9dc0230104bb..5c79146ecfb3 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -44,7 +44,7 @@
 #include <svx/sxmtritm.hxx>
 #include <svx/sxmuitm.hxx>
 
-#include "measure.hxx"
+#include <measure.hxx>
 
 const sal_uInt16 SvxMeasurePage::pRanges[] =
 {
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index f37ee3963c26..4e16c3f74db3 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -34,13 +34,13 @@
 
 #include <svx/numinf.hxx>
 
-#include "numfmt.hxx"
+#include <numfmt.hxx>
 #include <svx/numfmtsh.hxx>
 #include <dialmgr.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/basedlgs.hxx>
-#include "svx/flagsdef.hxx"
+#include <svx/flagsdef.hxx>
 #include <vector>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <memory>
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index f8e41abbd2e4..ad8078fe6602 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -41,7 +41,7 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
-#include "cuicharmap.hxx"
+#include <cuicharmap.hxx>
 #include <editeng/flstitem.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/xtable.hxx>
@@ -66,7 +66,7 @@
 #include <algorithm>
 #include <memory>
 #include <vector>
-#include "sfx2/opengrf.hxx"
+#include <sfx2/opengrf.hxx>
 
 #include <strings.hrc>
 #include <sfx2/request.hxx>
@@ -74,8 +74,8 @@
 #include <svl/stritem.hxx>
 #include <svl/slstitm.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include "svx/gallery1.hxx"
-#include "svx/galtheme.hxx"
+#include <svx/gallery1.hxx>
+#include <svx/galtheme.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 #include <rtl/ustring.h>
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 6766784cf456..90612b428267 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -31,8 +31,8 @@
 #include <sal/macros.h>
 
 #include <strings.hrc>
-#include "helpids.h"
-#include "page.hxx"
+#include <helpids.h>
+#include <page.hxx>
 #include <svx/pageitem.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/boxitem.hxx>
@@ -42,7 +42,7 @@
 #include <editeng/ulspitem.hxx>
 #include <editeng/sizeitem.hxx>
 #include <editeng/frmdiritem.hxx>
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include <editeng/paperinf.hxx>
 #include <dialmgr.hxx>
 #include <sfx2/module.hxx>
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 01fbba4af598..ed900bf18f16 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -30,7 +30,7 @@
 #include <svl/cjkoptions.hxx>
 #include <editeng/pgrditem.hxx>
 #include <strings.hrc>
-#include "paragrph.hxx"
+#include <paragrph.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <editeng/lspcitem.hxx>
 #include <editeng/adjustitem.hxx>
@@ -44,7 +44,7 @@
 #include <editeng/lrspitem.hxx>
 #include <editeng/formatbreakitem.hxx>
 #include <editeng/keepitem.hxx>
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include <dialmgr.hxx>
 #include <sfx2/htmlmode.hxx>
 #include <editeng/paravertalignitem.hxx>
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 104eadf95bf7..f1dbfc6417bb 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -27,11 +27,11 @@
 #include <svx/dialogs.hrc>
 
 #include <svx/xtable.hxx>
-#include "svx/globl3d.hxx"
+#include <svx/globl3d.hxx>
 #include <svx/svdmodel.hxx>
-#include "svx/drawitem.hxx"
-#include "cuitabarea.hxx"
-#include "dlgname.hxx"
+#include <svx/drawitem.hxx>
+#include <cuitabarea.hxx>
+#include <dlgname.hxx>
 #include <dialmgr.hxx>
 
 SvxAreaTabDialog::SvxAreaTabDialog
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index adade3557343..21d64d055743 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -22,13 +22,13 @@
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <svx/dialogs.hrc>
-#include "cuitabarea.hxx"
-#include "cuitabline.hxx"
-#include "dlgname.hxx"
+#include <cuitabarea.hxx>
+#include <cuitabline.hxx>
+#include <dlgname.hxx>
 #include <dialmgr.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/xtable.hxx>
-#include "svx/drawitem.hxx"
+#include <svx/drawitem.hxx>
 
 SvxLineTabDialog::SvxLineTabDialog
 (
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 50a9b5c0914e..ee55f1bb1a93 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -24,9 +24,9 @@
 #include <vcl/builderfactory.hxx>
 
 #include <editeng/lrspitem.hxx>
-#include "tabstpge.hxx"
+#include <tabstpge.hxx>
 #include <dialmgr.hxx>
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include <sfx2/module.hxx>
 #include <svl/cjkoptions.hxx>
 #include <unotools/localedatawrapper.hxx>
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 55c293510656..5d994f078271 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -22,12 +22,12 @@
 
 #include <svx/dialogs.hrc>
 
-#include "textanim.hxx"
-#include "textattr.hxx"
+#include <textanim.hxx>
+#include <textattr.hxx>
 #include <dialmgr.hxx>
-#include "svx/dlgutil.hxx"
-#include "svx/svdmark.hxx"
-#include "svx/svdview.hxx"
+#include <svx/dlgutil.hxx>
+#include <svx/svdmark.hxx>
+#include <svx/svdview.hxx>
 
 const sal_uInt16 SvxTextAnimationPage::pRanges[] =
 {
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index d21dffa3ead7..472a3931d8e6 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -31,9 +31,9 @@
 #include <svx/svdotext.hxx>
 #include <svx/dialogs.hrc>
 
-#include "textattr.hxx"
+#include <textattr.hxx>
 #include <dialmgr.hxx>
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include <sfx2/request.hxx>
 #include <svx/ofaitem.hxx>
 #include <editeng/writingmodeitem.hxx>
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index ca4aaab5c65d..6f19bc50e4bb 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -24,21 +24,21 @@
 #include <sfx2/module.hxx>
 #include <svx/dialogs.hrc>
 
-#include "svx/xattr.hxx"
+#include <svx/xattr.hxx>
 #include <svx/xpool.hxx>
 #include <svx/xflbckit.hxx>
 #include <svx/svdattr.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xlineit0.hxx>
-#include "svx/drawitem.hxx"
-#include "cuitabarea.hxx"
-#include "dlgname.hxx"
+#include <svx/drawitem.hxx>
+#include <cuitabarea.hxx>
+#include <dlgname.hxx>
 #include <dialmgr.hxx>
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/tabdlg.hxx>
-#include "sfx2/opengrf.hxx"
+#include <sfx2/opengrf.hxx>
 #include <vcl/layout.hxx>
 
 using namespace com::sun::star;
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 8ec7516ae437..192297547949 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -23,21 +23,21 @@
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <svx/dialogs.hrc>
-#include "svx/xattr.hxx"
+#include <svx/xattr.hxx>
 #include <svx/xpool.hxx>
 #include <strings.hrc>
 #include <svx/xflbckit.hxx>
 #include <svx/svdattr.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xlineit0.hxx>
-#include "svx/drawitem.hxx"
-#include "cuitabarea.hxx"
-#include "dlgname.hxx"
+#include <svx/drawitem.hxx>
+#include <cuitabarea.hxx>
+#include <dlgname.hxx>
 #include <dialmgr.hxx>
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
-#include "sfx2/opengrf.hxx"
+#include <sfx2/opengrf.hxx>
 #include <vcl/layout.hxx>
 #include <svx/svxdlg.hxx>
 #include <sfx2/viewsh.hxx>
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 9b20e7090a07..1b4b88ea6da3 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -30,17 +30,17 @@
 #include <vcl/msgbox.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <svx/ofaitem.hxx>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
 #include <strings.hrc>
-#include "helpids.h"
-#include "svx/xattr.hxx"
+#include <helpids.h>
+#include <svx/xattr.hxx>
 #include <svx/xpool.hxx>
 #include <svx/xtable.hxx>
-#include "svx/drawitem.hxx"
-#include "cuitabarea.hxx"
-#include "defdlgname.hxx"
-#include "dlgname.hxx"
+#include <svx/drawitem.hxx>
+#include <cuitabarea.hxx>
+#include <defdlgname.hxx>
+#include <dlgname.hxx>
 #include <svx/svxdlg.hxx>
 #include <dialmgr.hxx>
 #include <cuitabline.hxx>
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 0dd20ccd3feb..36a05915a6e5 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -25,18 +25,18 @@
 #include <sfx2/app.hxx>
 #include <sfx2/dialoghelper.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
 #include <strings.hrc>
-#include "helpids.h"
+#include <helpids.h>
 #include <svx/colorbox.hxx>
-#include "svx/xattr.hxx"
+#include <svx/xattr.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xpool.hxx>
-#include "svx/drawitem.hxx"
-#include "cuitabarea.hxx"
-#include "defdlgname.hxx"
-#include "dlgname.hxx"
+#include <svx/drawitem.hxx>
+#include <cuitabarea.hxx>
+#include <defdlgname.hxx>
+#include <dlgname.hxx>
 #include <svx/svxdlg.hxx>
 #include <dialmgr.hxx>
 #include <svx/dialmgr.hxx>
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 9c2e44e91d73..bcab052260aa 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -26,21 +26,21 @@
 #include <sfx2/dialoghelper.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/module.hxx>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
 #include <strings.hrc>
-#include "helpids.h"
+#include <helpids.h>
 #include <svx/colorbox.hxx>
-#include "svx/xattr.hxx"
+#include <svx/xattr.hxx>
 #include <svx/xpool.hxx>
 #include <svx/xtable.hxx>
-#include "svx/drawitem.hxx"
-#include "cuitabarea.hxx"
-#include "defdlgname.hxx"
-#include "dlgname.hxx"
+#include <svx/drawitem.hxx>
+#include <cuitabarea.hxx>
+#include <defdlgname.hxx>
+#include <dlgname.hxx>
 #include <svx/svxdlg.hxx>
 #include <dialmgr.hxx>
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/strings.hrc>
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index f99dcc975607..cf23d73813dc 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -26,18 +26,18 @@
 
 #include <strings.hrc>
 #include <svx/colorbox.hxx>
-#include "svx/xattr.hxx"
+#include <svx/xattr.hxx>
 #include <svx/xpool.hxx>
 #include <svx/xtable.hxx>
-#include "svx/drawitem.hxx"
-#include "cuitabline.hxx"
-#include "dlgname.hxx"
+#include <svx/drawitem.hxx>
+#include <cuitabline.hxx>
+#include <dlgname.hxx>
 #include <dialmgr.hxx>
-#include "svx/dlgutil.hxx"
-#include "svx/svxgrahicitem.hxx"
+#include <svx/dlgutil.hxx>
+#include <svx/svxgrahicitem.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/dialoghelper.hxx>
-#include "svx/ofaitem.hxx"
+#include <svx/ofaitem.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdmodel.hxx>
@@ -48,7 +48,7 @@
 #include <sfx2/objsh.hxx>
 #include <editeng/brushitem.hxx>
 #include <svx/gallery.hxx>
-#include "sfx2/opengrf.hxx"
+#include <sfx2/opengrf.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/strings.hrc>
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 27ed488d3c85..70f8bc9fd7af 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -24,27 +24,27 @@
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
 #include <strings.hrc>
-#include "helpids.h"
+#include <helpids.h>
 
-#include "svx/xattr.hxx"
+#include <svx/xattr.hxx>
 #include <svx/xpool.hxx>
 #include <svx/xtable.hxx>
 
-#include "svx/drawitem.hxx"
-#include "cuitabline.hxx"
-#include "dlgname.hxx"
-#include "defdlgname.hxx"
+#include <svx/drawitem.hxx>
+#include <cuitabline.hxx>
+#include <dlgname.hxx>
+#include <defdlgname.hxx>
 #include <svx/svxdlg.hxx>
 #include <dialmgr.hxx>
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/strings.hrc>
 #include <o3tl/make_unique.hxx>
-#include "cuitabarea.hxx"
+#include <cuitabarea.hxx>
 
 #define XOUT_WIDTH    150
 
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 16602120c0bf..e42c64ad03df 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -23,21 +23,21 @@
 #include <unotools/pathoptions.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
 #include <strings.hrc>
-#include "helpids.h"
+#include <helpids.h>
 #include <svx/dialmgr.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdopath.hxx>
-#include "svx/drawitem.hxx"
+#include <svx/drawitem.hxx>
 #include <svx/xpool.hxx>
 #include <svx/xtable.hxx>
-#include "cuitabline.hxx"
-#include "cuitabarea.hxx"
+#include <cuitabline.hxx>
+#include <cuitabarea.hxx>
 #include <svx/svxdlg.hxx>
 #include <dialmgr.hxx>
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index d0f3bd8cdf41..618858fdbf0b 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -27,7 +27,7 @@
 #include <sfx2/dialoghelper.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <unotools/localfilehelper.hxx>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <svx/colorbox.hxx>
 #include <svx/dialmgr.hxx>
 #include <vcl/bitmapaccess.hxx>
@@ -36,18 +36,18 @@
 #include <svx/strings.hrc>
 
 #include <strings.hrc>
-#include "helpids.h"
-#include "svx/xattr.hxx"
+#include <helpids.h>
+#include <svx/xattr.hxx>
 #include <svx/xpool.hxx>
 #include <svx/xtable.hxx>
-#include "svx/xoutbmp.hxx"
-#include "svx/drawitem.hxx"
-#include "cuitabarea.hxx"
-#include "defdlgname.hxx"
-#include "dlgname.hxx"
+#include <svx/xoutbmp.hxx>
+#include <svx/drawitem.hxx>
+#include <cuitabarea.hxx>
+#include <defdlgname.hxx>
+#include <dlgname.hxx>
 #include <svx/svxdlg.hxx>
 #include <dialmgr.hxx>
-#include "sfx2/opengrf.hxx"
+#include <sfx2/opengrf.hxx>
 
 #include <o3tl/make_unique.hxx>
 
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 8fae2bb86f7a..a9b0880f4dde 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -22,13 +22,13 @@
 #include <svx/colorbox.hxx>
 #include <svx/dialogs.hrc>
 
-#include "svx/xattr.hxx"
+#include <svx/xattr.hxx>
 #include <svx/xpool.hxx>
 #include <svx/svdattr.hxx>
-#include "svx/drawitem.hxx"
-#include "cuitabarea.hxx"
+#include <svx/drawitem.hxx>
+#include <cuitabarea.hxx>
 #include <dialmgr.hxx>
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include <cuitabline.hxx>
 #include <svx/xlineit0.hxx>
 #include <sfx2/request.hxx>
diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx
index edd7a0f930a4..04944de8b95b 100644
--- a/cui/source/tabpages/tptrans.cxx
+++ b/cui/source/tabpages/tptrans.cxx
@@ -24,21 +24,21 @@
 #include <sfx2/module.hxx>
 #include <svx/dialogs.hrc>
 
-#include "svx/xattr.hxx"
+#include <svx/xattr.hxx>
 #include <svx/xpool.hxx>
 #include <svx/xflbckit.hxx>
 #include <svx/svdattr.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xlineit0.hxx>
-#include "svx/drawitem.hxx"
-#include "cuitabarea.hxx"
-#include "dlgname.hxx"
+#include <svx/drawitem.hxx>
+#include <cuitabarea.hxx>
+#include <dlgname.hxx>
 #include <dialmgr.hxx>
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
 
-#include "sfx2/opengrf.hxx"
+#include <sfx2/opengrf.hxx>
 #include <vcl/layout.hxx>
 
 using namespace com::sun::star;
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 71221cacd3b9..1f87636e7691 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -29,11 +29,11 @@
 #include <svx/transfrmhelper.hxx>
 #include <editeng/sizeitem.hxx>
 
-#include "transfrm.hxx"
+#include <transfrm.hxx>
 #include <dialmgr.hxx>
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include <editeng/svxenum.hxx>
-#include "svx/anchorid.hxx"
+#include <svx/anchorid.hxx>
 #include <sfx2/module.hxx>
 #include <svl/rectitem.hxx>
 #include <svl/aeitem.hxx>
diff --git a/cui/source/uno/services.cxx b/cui/source/uno/services.cxx
index 20951e159242..34799d37bf8d 100644
--- a/cui/source/uno/services.cxx
+++ b/cui/source/uno/services.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <com/sun/star/registry/XRegistryKey.hpp>
-#include "sal/types.h"
-#include "cppuhelper/factory.hxx"
+#include <sal/types.h>
+#include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
 
 #include <colorpicker.hxx>
author	Stephan Bergmann <sbergman@redhat.com>	2017-10-23 22:43:01 +0200
committer	Stephan Bergmann <sbergman@redhat.com>	2017-10-23 22:46:10 +0200
commit	7182283c13238bdd3d6795f793f6c14b234585d4 (patch)
tree	38ee352cdadbd5d739d85707a58da065a0d2ac3c /cui
parent	4b27653a122acbbb38c800f0b1972f339e73d115 (diff)