loplugin:includeform: sfx2

Change-Id: I5e9a7a2580a710880023288f5ed3584708c4769d

117 files changed, 333 insertions, 333 deletions

diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 81ae44aac601..b6c5a65e4013 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -48,9 +48,9 @@
 #include <vcl/svapp.hxx>
 #include <sfx2/sfxhelp.hxx>
 #include <sfx2/request.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/sfxresid.hxx>
-#include "arrdecl.hxx"
+#include <arrdecl.hxx>
 #include <sfx2/progress.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfac.hxx>
@@ -61,20 +61,20 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "appdata.hxx"
-#include "openflag.hxx"
-#include "sfx2/strings.hrc"
+#include <appdata.hxx>
+#include <openflag.hxx>
+#include <sfx2/strings.hrc>
 #include <sfx2/module.hxx>
 #include <sfx2/event.hxx>
 #include "imestatuswindow.hxx"
-#include "workwin.hxx"
+#include <workwin.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/sfxdlg.hxx>
 #include <sfx2/stbitem.hxx>
-#include "eventsupplier.hxx"
+#include <eventsupplier.hxx>
 #include <sfx2/dockwin.hxx>
-#include "shellimpl.hxx"
+#include <shellimpl.hxx>
 
 #include <unotools/saveopt.hxx>
 #include <svtools/helpopt.hxx>
@@ -95,7 +95,7 @@
 #include <rtl/strbuf.hxx>
 #include <memory>
 #include <framework/sfxhelperfunctions.hxx>
-#include "fwkhelper.hxx"
+#include <fwkhelper.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 99d9573c1dc2..38adb1dbf712 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -46,9 +46,9 @@
 
 #include <sfx2/dinfdlg.hxx>
 #include <sfx2/module.hxx>
-#include "arrdecl.hxx"
+#include <arrdecl.hxx>
 #include <sfx2/app.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/msg.hxx>
 #include <sfx2/msgpool.hxx>
@@ -60,23 +60,23 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/tplpitem.hxx>
 #include <sfx2/minfitem.hxx>
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include <sfx2/evntconf.hxx>
 #include <sfx2/request.hxx>
-#include "appdata.hxx"
+#include <appdata.hxx>
 #include <sfx2/sfxhelp.hxx>
 #include <basic/basmgr.hxx>
 #include <svtools/strings.hrc>
 #include <unotools/configmgr.hxx>
-#include "sorgitm.hxx"
-#include "appbaslib.hxx"
+#include <sorgitm.hxx>
+#include <appbaslib.hxx>
 #include <basic/basicmanagerrepository.hxx>
 
 #include <svl/srchitem.hxx>
 #include <osl/socket.hxx>
 
 #define SFX_TYPEMAP
-#include "sfxslots.hxx"
+#include <sfxslots.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx
index a93ff2c24c3a..5d8d4b707e97 100644
--- a/sfx2/source/appl/appbaslib.cxx
+++ b/sfx2/source/appl/appbaslib.cxx
@@ -19,10 +19,10 @@
 
 #include <config_features.h>
 
-#include "appbaslib.hxx"
+#include <appbaslib.hxx>
 
 #include <sfx2/sfxuno.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/app.hxx>
 
 #include <basic/basmgr.hxx>
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 7153cf17b4d1..fcf76696ced2 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -58,17 +58,17 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/sfxhelp.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
-#include "objshimp.hxx"
+#include <objshimp.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/evntconf.hxx>
-#include "appdata.hxx"
-#include "workwin.hxx"
-#include "helper.hxx"
-#include "sfx2/strings.hrc"
+#include <appdata.hxx>
+#include <workwin.hxx>
+#include <helper.hxx>
+#include <sfx2/strings.hrc>
 #include <sfx2/sfxresid.hxx>
 #include "shutdownicon.hxx"
 
diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx
index 0cee7193875a..4a629036c975 100644
--- a/sfx2/source/appl/appchild.cxx
+++ b/sfx2/source/appl/appchild.cxx
@@ -22,15 +22,15 @@
 #include <svl/eitem.hxx>
 
 #include <sfx2/app.hxx>
-#include "appdata.hxx"
-#include "workwin.hxx"
-#include "childwinimpl.hxx"
+#include <appdata.hxx>
+#include <workwin.hxx>
+#include <childwinimpl.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/templdlg.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/sfxsids.hrc>
 
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 65c0f47a3d59..aabd7a4463e4 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -28,22 +28,22 @@
 #include <comphelper/processfactory.hxx>
 
 #include <sfx2/viewfrm.hxx>
-#include "appdata.hxx"
+#include <appdata.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/event.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/doctempl.hxx>
-#include "arrdecl.hxx"
+#include <arrdecl.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/unoctitm.hxx>
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include <sfx2/sfxresid.hxx>
-#include "objshimp.hxx"
+#include <objshimp.hxx>
 #include "imestatuswindow.hxx"
-#include "appbaslib.hxx"
+#include <appbaslib.hxx>
 #include <childwinimpl.hxx>
 
 #include <basic/basicmanagerrepository.hxx>
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 82734cfb759b..8f1ce9d8f25d 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -34,13 +34,13 @@
 #include <unotools/pathoptions.hxx>
 
 #include <sfx2/app.hxx>
-#include "appdata.hxx"
+#include <appdata.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/sfxsids.hrc>
-#include "helper.hxx"
+#include <helper.hxx>
 #include <sfx2/docfile.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 4ab0887200b9..2b8c5c337940 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -49,9 +49,9 @@
 #include <vcl/edit.hxx>
 
 #include <sfx2/unoctitm.hxx>
-#include "sfx2/strings.hrc"
-#include "appdata.hxx"
-#include "arrdecl.hxx"
+#include <sfx2/strings.hrc>
+#include <appdata.hxx>
+#include <arrdecl.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/evntconf.hxx>
@@ -59,12 +59,12 @@
 #include <sfx2/progress.hxx>
 #include <sfx2/sfxhelp.hxx>
 #include <sfx2/sfxresid.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/viewsh.hxx>
-#include "nochaos.hxx"
+#include <nochaos.hxx>
 #include <sfx2/fcontnr.hxx>
-#include "helper.hxx"
-#include "sfxpicklist.hxx"
+#include <helper.hxx>
+#include <sfxpicklist.hxx>
 #include <ctrlfactoryimpl.hxx>
 #include <shellimpl.hxx>
 
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 8408f4d0def9..5152c8a82643 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -26,19 +26,19 @@
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
 
-#include "sfxtypes.hxx"
-#include "appdata.hxx"
+#include <sfxtypes.hxx>
+#include <appdata.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/app.hxx>
-#include "arrdecl.hxx"
+#include <arrdecl.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/msgpool.hxx>
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include <sfx2/docfile.hxx>
-#include "workwin.hxx"
+#include <workwin.hxx>
 
 
 SfxFilterMatcher& SfxApplication::GetFilterMatcher()
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 4f80c0d6bff5..df09c343d3e3 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -47,7 +47,7 @@
 
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/app.hxx>
-#include "appdata.hxx"
+#include <appdata.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/stbitem.hxx>
 #include <sfx2/docfac.hxx>
@@ -56,17 +56,17 @@
 #include <sfx2/request.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
-#include "workwin.hxx"
+#include <workwin.hxx>
 #include <sfx2/fcontnr.hxx>
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include <sfx2/templdlg.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "openflag.hxx"
+#include <openflag.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/objface.hxx>
-#include "helper.hxx"
+#include <helper.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 
@@ -77,7 +77,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 
 #define SfxApplication
-#include "sfxslots.hxx"
+#include <sfxslots.hxx>
 
 SFX_IMPL_INTERFACE(SfxApplication,SfxShell)
 
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index aed27292c7c3..8e1a16c00f17 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -75,14 +75,14 @@
 #include <sfx2/objitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <svl/slstitm.hxx>
-#include "appopen.hxx"
-#include "objshimp.hxx"
-#include "openflag.hxx"
+#include <appopen.hxx>
+#include <objshimp.hxx>
+#include <openflag.hxx>
 #include <sfx2/passwd.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/viewsh.hxx>
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/objface.hxx>
@@ -90,7 +90,7 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/event.hxx>
 #include <sfx2/templatedlg.hxx>
-#include "openuriexternally.hxx"
+#include <openuriexternally.hxx>
 
 #include <officecfg/Office/ProtocolHandler.hxx>
 
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index c07016047e57..22a784fa5a33 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -29,29 +29,29 @@
 #include <unotools/saveopt.hxx>
 #include <unotools/misccfg.hxx>
 
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include <sfx2/app.hxx>
 #include <sfx2/evntconf.hxx>
 #include <sfx2/unoctitm.hxx>
-#include "appdata.hxx"
+#include <appdata.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/printer.hxx>
-#include "arrdecl.hxx"
+#include <arrdecl.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/event.hxx>
 #include <sfx2/templdlg.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/docfile.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/fcontnr.hxx>
-#include "nochaos.hxx"
+#include <nochaos.hxx>
 #include <sfx2/doctempl.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfac.hxx>
-#include "appbaslib.hxx"
-#include "childwinimpl.hxx"
+#include <appbaslib.hxx>
+#include <childwinimpl.hxx>
 #include <ctrlfactoryimpl.hxx>
 #include <shellimpl.hxx>
 #include <basic/basicmanagerrepository.hxx>
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index acdbdf69c069..7462a41f40f1 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -21,18 +21,18 @@
 #include <vcl/toolbox.hxx>
 
 #include <sfx2/app.hxx>
-#include "appdata.hxx"
+#include <appdata.hxx>
 #include <sfx2/sfxhelp.hxx>
 #include <sfx2/templdlg.hxx>
-#include "inettbc.hxx"
+#include <inettbc.hxx>
 #include <sfx2/stbitem.hxx>
 #include <sfx2/infobar.hxx>
 #include <sfx2/navigat.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "partwnd.hxx"
+#include <partwnd.hxx>
 #include <sfx2/sfxsids.hrc>
-#include "recfloat.hxx"
+#include <recfloat.hxx>
 #include <ctrlfactoryimpl.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 17b71fde7269..1e2a2ec4984c 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -99,23 +99,23 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/new.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/tabdlg.hxx>
-#include "arrdecl.hxx"
-#include "sfx2/strings.hrc"
+#include <arrdecl.hxx>
+#include <sfx2/strings.hrc>
 #include <sfx2/passwd.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/childwin.hxx>
-#include "appdata.hxx"
+#include <appdata.hxx>
 #include <sfx2/minfitem.hxx>
 #include <sfx2/event.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "sfxpicklist.hxx"
+#include <sfxpicklist.hxx>
 #include "imestatuswindow.hxx"
 #include <sfx2/sfxdlg.hxx>
 #include <sfx2/sfxsids.hrc>
-#include "sorgitm.hxx"
+#include <sorgitm.hxx>
 #include <sfx2/sfxhelp.hxx>
 #include <sfx2/zoomitem.hxx>
 #include <sfx2/templatedlg.hxx>
@@ -131,7 +131,7 @@
 #include <officecfg/Setup.hxx>
 #include <memory>
 
-#include "openuriexternally.hxx"
+#include <openuriexternally.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 84e113e8bca6..c1088d275d33 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "fltoptint.hxx"
-#include "objshimp.hxx"
+#include <fltoptint.hxx>
+#include <objshimp.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/brokenpackageint.hxx>
 #include <sfx2/dispatch.hxx>
@@ -34,8 +34,8 @@
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/unoctitm.hxx>
-#include "sfxslots.hxx"
-#include "sfxtypes.hxx"
+#include <sfxslots.hxx>
+#include <sfxtypes.hxx>
 
 #include <sal/config.h>
 #include <basic/basmgr.hxx>
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 3a8d85c2a9df..b89482663816 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -34,8 +34,8 @@
 #include <sfx2/module.hxx>
 #include <sfx2/dockwin.hxx>
 #include <sfx2/dispatch.hxx>
-#include "workwin.hxx"
-#include "childwinimpl.hxx"
+#include <workwin.hxx>
+#include <childwinimpl.hxx>
 
 static const sal_uInt16 nVersion = 2;
 
diff --git a/sfx2/source/appl/childwinimpl.cxx b/sfx2/source/appl/childwinimpl.cxx
index 8d8e362b91d5..93b5fbe6cb09 100644
--- a/sfx2/source/appl/childwinimpl.cxx
+++ b/sfx2/source/appl/childwinimpl.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <memory>
-#include "childwinimpl.hxx"
+#include <childwinimpl.hxx>
 
 size_t SfxChildWinContextArr_Impl::size() const
 {
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index fa7e8e03acac..bb71b5ddc413 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -39,7 +39,7 @@
 #include <sfx2/opengrf.hxx>
 #include <sfx2/sfxresid.hxx>
 #include "fileobj.hxx"
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include <vcl/dibtools.hxx>
 
 #define FILETYPE_TEXT       1
diff --git a/sfx2/source/appl/fwkhelper.cxx b/sfx2/source/appl/fwkhelper.cxx
index e61a210bc702..f37eee376bca 100644
--- a/sfx2/source/appl/fwkhelper.cxx
+++ b/sfx2/source/appl/fwkhelper.cxx
@@ -25,8 +25,8 @@
 
 #include <vcl/svapp.hxx>
 
-#include "fwkhelper.hxx"
-#include "workwin.hxx"
+#include <fwkhelper.hxx>
+#include <workwin.hxx>
 #include <sfx2/frame.hxx>
 
 void SAL_CALL RefreshToolbars( css::uno::Reference< css::frame::XFrame > const & xFrame )
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index bf8907fd1f6b..4f91e64a1343 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -38,11 +38,11 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <sfx2/request.hxx>
 #include <vcl/dibtools.hxx>
-#include "unotools/charclass.hxx"
+#include <unotools/charclass.hxx>
 
 #include "fileobj.hxx"
 #include "impldde.hxx"
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include <sfx2/sfxresid.hxx>
 
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 9b9def09f213..faf9e92957c4 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -27,7 +27,7 @@
 #include <vcl/layout.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <vcl/svapp.hxx>
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <tools/debug.hxx>
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 16dbcf563006..ef37f8e41ada 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -36,8 +36,8 @@
 #include <sal/log.hxx>
 
 #define SfxModule
-#include "sfxslots.hxx"
-#include "childwinimpl.hxx"
+#include <sfxslots.hxx>
+#include <childwinimpl.hxx>
 #include <ctrlfactoryimpl.hxx>
 
 class SfxModule_Impl
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 9a93d6cfd3f9..4b8e33a2d980 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -22,18 +22,18 @@
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/sfxresid.hxx>
 #include "helpinterceptor.hxx"
-#include "helper.hxx"
+#include <helper.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/app.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include "panelist.hxx"
-#include "srchdlg.hxx"
+#include <srchdlg.hxx>
 #include <sfx2/sfxhelp.hxx>
 #include <svtools/treelistentry.hxx>
 
-#include "sfx2/strings.hrc"
-#include "helpids.h"
-#include "bitmaps.hlst"
+#include <sfx2/strings.hrc>
+#include <helpids.h>
+#include <bitmaps.hlst>
 
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/configurationhelper.hxx>
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 3dea56bda052..9b8af00a3d51 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -36,7 +36,7 @@
 #include <svtools/treelistbox.hxx>
 #include <unotools/moduleoptions.hxx>
 
-#include "srchdlg.hxx"
+#include <srchdlg.hxx>
 
 // context menu ids
 #define MID_OPEN                                1
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index 16e0b0de5008..0bb827edd1fc 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -44,7 +44,7 @@
 #include <sfx2/docfile.hxx>
 #include <unotools/pathoptions.hxx>
 #include <sfx2/opengrf.hxx>
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include <sfx2/sfxresid.hxx>
 
 
diff --git a/sfx2/source/appl/openuriexternally.cxx b/sfx2/source/appl/openuriexternally.cxx
index a72c3b78b1be..9518b913441b 100644
--- a/sfx2/source/appl/openuriexternally.cxx
+++ b/sfx2/source/appl/openuriexternally.cxx
@@ -24,9 +24,9 @@
 #include <vcl/layout.hxx>
 #include <vcl/svapp.hxx>
 
-#include "openuriexternally.hxx"
+#include <openuriexternally.hxx>
 
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 
 bool sfx2::openUriExternally(
     OUString const & uri, bool handleSystemShellExecuteException)
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index d0695acdd481..7de805350551 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -54,14 +54,14 @@
 #include <vcl/layout.hxx>
 #include <svtools/ehdl.hxx>
 #include <svtools/sfxecode.hxx>
-#include "openuriexternally.hxx"
+#include <openuriexternally.hxx>
 
 #include "newhelp.hxx"
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/sfxresid.hxx>
-#include "helper.hxx"
-#include "sfx2/strings.hrc"
+#include <helper.hxx>
+#include <sfx2/strings.hrc>
 #include <sfx2/sfxuno.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/frame.hxx>
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index ab41cf07ffda..b645c8820138 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -38,16 +38,16 @@
 
 
 #include <sfx2/app.hxx>
-#include "sfxpicklist.hxx"
+#include <sfxpicklist.hxx>
 #include <sfx2/sfxuno.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/event.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/docfile.hxx>
-#include "objshimp.hxx"
+#include <objshimp.hxx>
 #include <openurlhint.hxx>
 #include <sfx2/docfilt.hxx>
 
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 9bc7812cc35a..595d612d0690 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -23,7 +23,7 @@
 
 #include <boost/logic/tribool.hpp>
 #include <config_folders.h>
-#include <shutdownicon.hxx>
+#include "shutdownicon.hxx"
 #include <sfx2/strings.hrc>
 #include <sfx2/app.hxx>
 #include <osl/mutex.hxx>
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index 5ecebc6f5b5f..2909f9195577 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -27,7 +27,7 @@
 #include <glib.h>
 #include <osl/module.hxx>
 #include <sfx2/app.hxx>
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include "shutdownicon.hxx"
 
 #include <config_gio.h>
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 578a202f1540..e4fb41ad1508 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -24,14 +24,14 @@
 #include <sfx2/objface.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/app.hxx>
-#include "workwin.hxx"
+#include <workwin.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/dockwin.hxx>
 #include <sfx2/viewsh.hxx>
-#include "splitwin.hxx"
-#include "childwinimpl.hxx"
+#include <splitwin.hxx>
+#include <childwinimpl.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/request.hxx>
diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index 49a6a75dac0f..665209b4c554 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -19,7 +19,7 @@
 
 #include <sal/log.hxx>
 
-#include "bitset.hxx"
+#include <bitset.hxx>
 
 #include <string.h>
 #include <limits.h>
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 16e95a3bf1a3..42605dc29efe 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -66,21 +66,21 @@
 #include <sfx2/sfxhelp.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfac.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/progress.hxx>
-#include "openflag.hxx"
-#include "sfx2/strings.hrc"
+#include <openflag.hxx>
+#include <sfx2/strings.hrc>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/doctempl.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "helper.hxx"
+#include <helper.hxx>
 #include "fltlst.hxx"
 #include <sfx2/request.hxx>
-#include "arrdecl.hxx"
+#include <arrdecl.hxx>
 #include <o3tl/make_unique.hxx>
 
 #include <vector>
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index 4ed8f4755b8b..65ac16e894c8 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -27,7 +27,7 @@
 #include <sfx2/evntconf.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/fcontnr.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 
 static sal_Char const sHTML_SC_yes[] =  "YES";
 static sal_Char const sHTML_SC_no[] =       "NO";
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 773f5c09bdf8..77ad3a324e45 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -35,8 +35,8 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/objsh.hxx>
-#include "sfx2/strings.hrc"
-#include "strings.hxx"
+#include <sfx2/strings.hrc>
+#include <strings.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index 51fa98d4af4e..549f1d16d87a 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "helper.hxx"
+#include <helper.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index a2bc394cacec..8e84cd32f369 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -27,7 +27,7 @@
 #include <svl/eitem.hxx>
 #include <tools/time.hxx>
 
-#include "appdata.hxx"
+#include <appdata.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -35,14 +35,14 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/docfile.hxx>
-#include "workwin.hxx"
+#include <workwin.hxx>
 #include <sfx2/sfxresid.hxx>
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include <sfx2/msg.hxx>
-#include "sfxslots.hxx"
-#include "sfxbasecontroller_internal.hxx"
+#include <sfxslots.hxx>
+#include <sfxbasecontroller_internal.hxx>
 #include <time.h>
 
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index ee2137a3ed56..4276e0c16df7 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -23,7 +23,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/event.hxx>
-#include "openflag.hxx"
+#include <openflag.hxx>
 
 #include <svtools/htmlkywd.hxx>
 #include <svtools/htmltokn.h>
diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx
index 9189ec73558e..aa7cd8d60f39 100644
--- a/sfx2/source/bastyp/sfxresid.cxx
+++ b/sfx2/source/bastyp/sfxresid.cxx
@@ -19,7 +19,7 @@
 
 
 #include <sfx2/sfxresid.hxx>
-#include "unotools/resmgr.hxx"
+#include <unotools/resmgr.hxx>
 
 OUString SfxResId(const char* pId)
 {
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 35d42f08ef2a..58c6f2251feb 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -38,7 +38,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/sfxresid.hxx>
-#include "eventsupplier.hxx"
+#include <eventsupplier.hxx>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index cc3990ba70f6..a71060120efd 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -35,20 +35,20 @@
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
 #include <comphelper/processfactory.hxx>
-#include "itemdel.hxx"
+#include <itemdel.hxx>
 
 //Includes below due to nInReschedule
-#include "appdata.hxx"
+#include <appdata.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/msg.hxx>
-#include "statcach.hxx"
+#include <statcach.hxx>
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/objface.hxx>
-#include "sfxtypes.hxx"
-#include "workwin.hxx"
+#include <sfxtypes.hxx>
+#include <workwin.hxx>
 #include <sfx2/unoctitm.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index 19a45080eb01..32d417c7e5a9 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -23,7 +23,7 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/msgpool.hxx>
-#include "statcach.hxx"
+#include <statcach.hxx>
 #include <sfx2/viewfrm.hxx>
 
 // returns the next registered SfxControllerItem with the same id
diff --git a/sfx2/source/control/itemdel.cxx b/sfx2/source/control/itemdel.cxx
index 4080dd91f9eb..9ee76fd6a2bb 100644
--- a/sfx2/source/control/itemdel.cxx
+++ b/sfx2/source/control/itemdel.cxx
@@ -19,7 +19,7 @@
 
 #include <sal/config.h>
 
-#include "itemdel.hxx"
+#include <itemdel.hxx>
 #include <vcl/idle.hxx>
 
 #include <svl/itempool.hxx>
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index cc64353f72f1..f9290e1ebc80 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -21,14 +21,14 @@
 #include <svl/style.hxx>
 
 // due to pSlotPool
-#include "appdata.hxx"
+#include <appdata.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/msg.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/sfxresid.hxx>
-#include "arrdecl.hxx"
+#include <arrdecl.hxx>
 #include <sfx2/module.hxx>
 
 #include <sfx2/strings.hrc>
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index 5eb0ba522d0c..3be2690f0688 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <sfx2/strings.hrc>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 #include <officecfg/Office/Common.hxx>
 
diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx
index e41b983a4642..9b3f5be032ae 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -24,7 +24,7 @@
 #include <vcl/svapp.hxx>
 
 #include <sfx2/strings.hrc>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 using namespace basegfx;
 using namespace com::sun::star;
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 55c94afe17ea..572af7ed108d 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -29,7 +29,7 @@
 #include <svl/itemiter.hxx>
 
 #include <svl/itempool.hxx>
-#include "itemdel.hxx"
+#include <itemdel.hxx>
 
 #include <comphelper/processfactory.hxx>
 
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index 5073851ab655..a115d4baa34a 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -23,7 +23,7 @@
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/itemset.hxx>
-#include "itemdel.hxx"
+#include <itemdel.hxx>
 #include <svl/visitem.hxx>
 #include <cppuhelper/weak.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 7f7d1e1630c6..f38852910171 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -25,7 +25,7 @@
 #include <sal/log.hxx>
 #include <svl/itempool.hxx>
 #include <svl/undo.hxx>
-#include "itemdel.hxx"
+#include <itemdel.hxx>
 #include <svtools/asynclink.hxx>
 #include <basic/sbx.hxx>
 #include <unotools/configmgr.hxx>
@@ -37,9 +37,9 @@
 #include <sfx2/objface.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/request.hxx>
-#include "statcach.hxx"
+#include <statcach.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sidebar/ContextChangeBroadcaster.hxx>
 #include <com/sun/star/ui/dialogs/XSLTFilterDialog.hpp>
diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx
index e064fbf5b1e5..1a5709f00a51 100644
--- a/sfx2/source/control/sorgitm.cxx
+++ b/sfx2/source/control/sorgitm.cxx
@@ -19,7 +19,7 @@
 
 
 #include <sfx2/sfxsids.hrc>
-#include "sorgitm.hxx"
+#include <sorgitm.hxx>
 #include <osl/diagnose.h>
 #include <typeinfo>
 
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index a8654ba26f77..1ec54f2fd1c3 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -35,11 +35,11 @@
 #include <comphelper/processfactory.hxx>
 
 #include <sfx2/app.hxx>
-#include "statcach.hxx"
+#include <statcach.hxx>
 #include <sfx2/msg.hxx>
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/dispatch.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/unoctitm.hxx>
 #include <sfx2/msgpool.hxx>
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 808e0b1a9a75..a58e86d875a2 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
 #include <sfx2/strings.hrc>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 #define MNI_OPEN               1
 #define MNI_EDIT               2
diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx
index 440e34b1bc61..374a3b268ef3 100644
--- a/sfx2/source/control/templatesearchview.cxx
+++ b/sfx2/source/control/templatesearchview.cxx
@@ -7,15 +7,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "templatesearchview.hxx"
-#include "templatesearchviewitem.hxx"
+#include <templatesearchview.hxx>
+#include <templatesearchviewitem.hxx>
 #include <sfx2/templatelocalview.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/layout.hxx>
 
 #include <sfx2/strings.hrc>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 #include <vcl/builderfactory.hxx>
 
diff --git a/sfx2/source/control/templateviewitem.cxx b/sfx2/source/control/templateviewitem.cxx
index 5ebc0ee58d60..bbb2a2d30c99 100644
--- a/sfx2/source/control/templateviewitem.cxx
+++ b/sfx2/source/control/templateviewitem.cxx
@@ -24,7 +24,7 @@
 #include <sfx2/sfxresid.hxx>
 
 #include <sfx2/strings.hrc>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 using namespace basegfx;
 using namespace basegfx::utils;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 1636be332a55..2db72d42d829 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -59,7 +59,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/request.hxx>
-#include "statcach.hxx"
+#include <statcach.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index 7421173023f0..66c9424067be 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -23,7 +23,7 @@
 #include <sfx2/sfxuno.hxx>
 #include <unotools/saveopt.hxx>
 #include <vcl/msgbox.hxx>
-#include "alienwarn.hxx"
+#include <alienwarn.hxx>
 
 SfxAlienWarningDialog::SfxAlienWarningDialog(vcl::Window* pParent, const OUString& _rFormatName,
                                              const OUString& _rDefaultExtension, bool rDefaultIsAlien)
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index bfc0ac45a39b..539f369534ac 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -41,9 +41,9 @@
 #include <sfx2/childwin.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/sfxhelp.hxx>
-#include "workwin.hxx"
+#include <workwin.hxx>
 #include <sfx2/sfxresid.hxx>
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 
 using namespace ::com::sun::star::uno;
 
diff --git a/sfx2/source/dialog/bluthsnd.cxx b/sfx2/source/dialog/bluthsnd.cxx
index 9150b411e522..2dcd87e4fc45 100644
--- a/sfx2/source/dialog/bluthsnd.cxx
+++ b/sfx2/source/dialog/bluthsnd.cxx
@@ -14,7 +14,7 @@
 
 #include <stdio.h>
 
-#include "bluthsndapi.hxx"
+#include <bluthsndapi.hxx>
 
 SfxBluetoothModel::SendMailResult SfxBluetoothModel::SaveAndSend( const css::uno::Reference< css::frame::XFrame >& xFrame )
 {
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 1a84fb241fc4..665de8babec5 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -59,16 +59,16 @@
 #include <sfx2/passwd.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/dinfdlg.hxx>
-#include "helper.hxx"
+#include <helper.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
 #include <comphelper/storagehelper.hxx>
 
-#include "documentfontsdialog.hxx"
-#include "dinfdlg.hrc"
-#include "sfx2/strings.hrc"
-#include "strings.hxx"
-#include "bitmaps.hlst"
+#include <documentfontsdialog.hxx>
+#include <dinfdlg.hrc>
+#include <sfx2/strings.hrc>
+#include <strings.hxx>
+#include <bitmaps.hlst>
 #include <vcl/help.hxx>
 #include <vcl/builderfactory.hxx>
 
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 165e0e033466..8478cba9306f 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -32,8 +32,8 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
-#include "workwin.hxx"
-#include "splitwin.hxx"
+#include <workwin.hxx>
+#include <splitwin.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/sfxhelp.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/sfx2/source/dialog/documentfontsdialog.cxx b/sfx2/source/dialog/documentfontsdialog.cxx
index 22b495c3cab3..abf8af73a747 100644
--- a/sfx2/source/dialog/documentfontsdialog.cxx
+++ b/sfx2/source/dialog/documentfontsdialog.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "documentfontsdialog.hxx"
+#include <documentfontsdialog.hxx>
 
 #include <sfx2/objsh.hxx>
 
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 53f706761454..3393046a66bd 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -80,7 +80,7 @@
 #include <sfx2/frame.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfac.hxx>
-#include "openflag.hxx"
+#include <openflag.hxx>
 #include <sfx2/passwd.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/sfxsids.hrc>
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 997c8ecd1fac..00fdcb0a2264 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -55,10 +55,10 @@
 #include <vcl/layout.hxx>
 
 #include <sfx2/mailmodelapi.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/sfxsids.hrc>
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 
 #include <unotools/tempfile.hxx>
 #include <unotools/configitem.hxx>
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 76a0f097958b..e93adca35721 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -31,13 +31,13 @@
 #include <sfx2/app.hxx>
 #include <sfx2/mgetempl.hxx>
 #include <sfx2/objsh.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/module.hxx>
 
 #include <sfx2/templdlg.hxx>
-#include "templdgi.hxx"
-#include "sfx2/strings.hrc"
+#include <templdgi.hxx>
+#include <sfx2/strings.hrc>
 
 #include <svl/stritem.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index c99aeb6c7c8a..2c0e974e62de 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -24,7 +24,7 @@
 #include <sfx2/strings.hrc>
 #include <sfx2/app.hxx>
 #include <sfx2/sfxresid.hxx>
-#include "helpids.h"
+#include <helpids.h>
 
 SFX_IMPL_DOCKINGWINDOW( SfxNavigatorWrapper , SID_NAVIGATOR );
 
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index 56dc7efde514..76dd62b0539d 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -22,7 +22,7 @@
 #include <svl/style.hxx>
 
 #include <sfx2/newstyle.hxx>
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include <sfx2/sfxresid.hxx>
 #include <vcl/layout.hxx>
 
diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx
index badfed081dd7..5bcb4b977ab6 100644
--- a/sfx2/source/dialog/partwnd.cxx
+++ b/sfx2/source/dialog/partwnd.cxx
@@ -35,7 +35,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include <sfx2/sfxsids.hrc>
-#include "partwnd.hxx"
+#include <partwnd.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 62ff5cb3172f..1f7cc583ad87 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -22,10 +22,10 @@
 #include <vcl/layout.hxx>
 
 #include <sfx2/passwd.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/sfxresid.hxx>
 
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 
 
 IMPL_LINK( SfxPasswordDialog, EditModifyHdl, Edit&, rEdit, void )
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index 1c1acc84c958..eb3d34176757 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -20,8 +20,8 @@
 #include <svl/eitem.hxx>
 #include <vcl/msgbox.hxx>
 
-#include "recfloat.hxx"
-#include "sfx2/strings.hrc"
+#include <recfloat.hxx>
+#include <sfx2/strings.hrc>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index 984527248795..cfc79b606335 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -37,7 +37,7 @@
 #include <svl/intitem.hxx>
 #include <svl/PasswordHelper.hxx>
 
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 
 
 using namespace ::com::sun::star;
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 232d41106a52..686df19aaa55 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -29,11 +29,11 @@
 #include <vcl/menu.hxx>
 #include <vcl/timer.hxx>
 
-#include "splitwin.hxx"
-#include "workwin.hxx"
+#include <splitwin.hxx>
+#include <workwin.hxx>
 #include <sfx2/dockwin.hxx>
 #include <sfx2/app.hxx>
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index 95beb5059c3b..3e1ead28c63c 100644
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -18,12 +18,12 @@
  */
 
 
-#include "srchdlg.hxx"
+#include <srchdlg.hxx>
 #include <comphelper/string.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/sfxuno.hxx>
 
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include <tools/debug.hxx>
 #include <unotools/viewoptions.hxx>
 
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index 00acce620dd6..a619c6595b6e 100644
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -26,7 +26,7 @@
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/sfxuno.hxx>
 
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 
 // class SfxStyleDialog --------------------------------------------------
 
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 44ca8cfa3087..ef7c8bdb039d 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -25,8 +25,8 @@
 #include <vcl/msgbox.hxx>
 #include <unotools/viewoptions.hxx>
 
-#include "appdata.hxx"
-#include "sfxtypes.hxx"
+#include <appdata.hxx>
+#include <sfxtypes.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/app.hxx>
@@ -37,10 +37,10 @@
 #include <sfx2/sfxdlg.hxx>
 #include <sfx2/itemconnect.hxx>
 
-#include "uitest/sfx_uiobject.hxx"
+#include <uitest/sfx_uiobject.hxx>
 
-#include "sfx2/strings.hrc"
-#include "helpids.h"
+#include <sfx2/strings.hrc>
+#include <helpids.h>
 
 using namespace ::com::sun::star::uno;
 
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 45f7152c0160..bb78f0b8f87e 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -40,9 +40,9 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/templdlg.hxx>
-#include "templdgi.hxx"
-#include "tplcitem.hxx"
-#include "sfxtypes.hxx"
+#include <templdgi.hxx>
+#include <tplcitem.hxx>
+#include <sfxtypes.hxx>
 #include <sfx2/styfitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
@@ -50,15 +50,15 @@
 #include <sfx2/tplpitem.hxx>
 #include <sfx2/sfxresid.hxx>
 
-#include "sfx2/strings.hrc"
-#include "arrdecl.hxx"
+#include <sfx2/strings.hrc>
+#include <arrdecl.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/doctempl.hxx>
 #include <sfx2/module.hxx>
-#include "helpids.h"
-#include "bitmaps.hlst"
-#include "appdata.hxx"
+#include <helpids.h>
+#include <bitmaps.hlst>
+#include <appdata.hxx>
 #include <sfx2/viewfrm.hxx>
 
 #include <svtools/svlbitm.hxx>
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index f7ba40f5311a..36ca2572d6e7 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -21,8 +21,8 @@
 #include <sfx2/titledockwin.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
-#include "sfx2/strings.hrc"
-#include "bitmaps.hlst"
+#include <sfx2/strings.hrc>
+#include <bitmaps.hlst>
 #include <sfx2/sfxresid.hxx>
 
 #include <svl/eitem.hxx>
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index 44fd583c81d9..12afcf6fc789 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -23,10 +23,10 @@
 #include <sfx2/templdlg.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/tplpitem.hxx>
-#include "tplcitem.hxx"
-#include "templdgi.hxx"
+#include <tplcitem.hxx>
+#include <templdgi.hxx>
 
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 
 // Constructor
 
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index ce9e44fc6aa1..5e4792aa88a8 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -34,8 +34,8 @@
 #include <svtools/treelistentry.hxx>
 #include <svtools/miscopt.hxx>
 
-#include "versdlg.hxx"
-#include "sfx2/strings.hrc"
+#include <versdlg.hxx>
+#include <sfx2/strings.hrc>
 #include <sfx2/dialoghelper.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/sfxresid.hxx>
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index 54f212ee58f8..a4ead8ff3e37 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -36,7 +36,7 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/viewfac.hxx>
 #include <sfx2/fcontnr.hxx>
-#include "arrdecl.hxx"
+#include <arrdecl.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/sfxresid.hxx>
@@ -44,7 +44,7 @@
 #include "syspath.hxx"
 #include <osl/file.hxx>
 #include <osl/security.hxx>
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 
 #include <rtl/strbuf.hxx>
 #include <tools/globname.hxx>
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index a7dc38a6bd7c..495a3d3ab454 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -108,7 +108,7 @@
 #include <svl/documentlockfile.hxx>
 #include <com/sun/star/document/DocumentRevisionListPersistence.hpp>
 
-#include "helper.hxx"
+#include <helper.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/frame.hxx>
@@ -117,8 +117,8 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/sfxsids.hrc>
-#include "sfx2/strings.hrc"
-#include "openflag.hxx"
+#include <sfx2/strings.hrc>
+#include <openflag.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <officecfg/Office/Common.hxx>
 
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index 4be520f4d1fc..fc0432dd43c5 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -22,8 +22,8 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include "appopen.hxx"
-#include "openflag.hxx"
+#include <appopen.hxx>
+#include <openflag.hxx>
 #include <sfx2/passwd.hxx>
 
 #include <sfx2/sfxsids.hrc>
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index a1699820bc10..1d2315606f97 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -63,7 +63,7 @@
 #include <com/sun/star/embed/XTransactedObject.hpp>
 
 #include "doctemplateslocal.hxx"
-#include "sfxurlrelocator.hxx"
+#include <sfxurlrelocator.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
@@ -82,11 +82,11 @@ using namespace ::ucbhelper;
 #include <sfx2/docfac.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/sfxresid.hxx>
-#include "sfx2/strings.hrc"
-#include "strings.hxx"
+#include <sfx2/strings.hrc>
+#include <strings.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <svtools/templatefoldercache.hxx>
 
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 4c6eed134cb1..ec5efdfa4884 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -76,12 +76,12 @@
 #include <unotools/ucbhelper.hxx>
 
 #include <sfx2/sfxresid.hxx>
-#include "sfxurlrelocator.hxx"
+#include <sfxurlrelocator.hxx>
 #include "doctemplateslocal.hxx"
 #include <sfx2/docfac.hxx>
 #include <sfx2/docfile.hxx>
-#include "sfx2/strings.hrc"
-#include "doctempl.hrc"
+#include <sfx2/strings.hrc>
+#include <doctempl.hrc>
 
 #include <memory>
 #include <vector>
diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx
index 2036a1f16bec..f439ade3bce7 100644
--- a/sfx2/source/doc/docundomanager.cxx
+++ b/sfx2/source/doc/docundomanager.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "docundomanager.hxx"
+#include <docundomanager.hxx>
 #include <sfx2/sfxbasemodel.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index a4df9af84b74..eefc8fd885f1 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -51,8 +51,8 @@
 
 #include <sfx2/sfxresid.hxx>
 #include "graphhelp.hxx"
-#include "sfx2/strings.hrc"
-#include "bitmaps.hlst"
+#include <sfx2/strings.hrc>
+#include <bitmaps.hlst>
 
 #include <memory>
 
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 79c954c43e7f..1da245af8a2e 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -50,7 +50,7 @@
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/io/IOException.hpp>
 
-#include "guisaveas.hxx"
+#include <guisaveas.hxx>
 
 #include <unotools/pathoptions.hxx>
 #include <svl/itemset.hxx>
@@ -78,7 +78,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>
 #include <sfxtypes.hxx>
-#include "alienwarn.hxx"
+#include <alienwarn.hxx>
 
 #include <sfx2/docmacromode.hxx>
 #include <comphelper/interaction.hxx>
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 0696c9aaaab6..604fb0a58f18 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -31,13 +31,13 @@
 #include <svtools/ehdl.hxx>
 #include <tools/urlobj.hxx>
 
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/docfile.hxx>
-#include "preview.hxx"
+#include <preview.hxx>
 #include <sfx2/printer.hxx>
 #include <vcl/waitobj.hxx>
 
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index e213dadcca68..4cacda2ff0a5 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -53,12 +53,12 @@
 #include <sfx2/app.hxx>
 #include <sfx2/dinfdlg.hxx>
 #include <sfx2/sfxresid.hxx>
-#include "appdata.hxx"
+#include <appdata.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/objsh.hxx>
-#include "objshimp.hxx"
+#include <objshimp.hxx>
 #include <sfx2/evntconf.hxx>
 #include <sfx2/sfxhelp.hxx>
 #include <sfx2/dispatch.hxx>
@@ -67,11 +67,11 @@
 #include <svtools/strings.hrc>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/doctempl.hxx>
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include <sfx2/sfxbasemodel.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/request.hxx>
-#include "openflag.hxx"
+#include <openflag.hxx>
 #include "querytemplate.hxx"
 #include <memory>
 
diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx
index 2d59de087943..7c9763b1aa8b 100644
--- a/sfx2/source/doc/objembed.cxx
+++ b/sfx2/source/doc/objembed.cxx
@@ -26,7 +26,7 @@
 
 #include <sfx2/objsh.hxx>
 #include <sfx2/app.hxx>
-#include "objshimp.hxx"
+#include <objshimp.hxx>
 #include <sfx2/event.hxx>
 
 #include <comphelper/seqstream.hxx>
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index d0cce800325e..a5e62da8c0a2 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -84,30 +84,30 @@
 
 #include <sfx2/signaturestate.hxx>
 #include <sfx2/app.hxx>
-#include "appdata.hxx"
+#include <appdata.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/objsh.hxx>
-#include "objshimp.hxx"
+#include <objshimp.hxx>
 #include <sfx2/event.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/ctrlitem.hxx>
-#include "arrdecl.hxx"
+#include <arrdecl.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/docfac.hxx>
-#include "helper.hxx"
-#include "sfx2/strings.hrc"
-#include "workwin.hxx"
-#include "helpids.h"
+#include <helper.hxx>
+#include <sfx2/strings.hrc>
+#include <workwin.hxx>
+#include <helpids.h>
 #include <sfx2/sfxdlg.hxx>
-#include "appbaslib.hxx"
+#include <appbaslib.hxx>
 #include <openflag.hxx>
-#include <objstor.hxx>
+#include "objstor.hxx"
 #include <appopen.hxx>
 
 #include <memory>
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 2a757e4b4512..62f2f003016b 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -76,12 +76,12 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objitem.hxx>
 #include <sfx2/objsh.hxx>
-#include "objshimp.hxx"
-#include "sfxtypes.hxx"
+#include <objshimp.hxx>
+#include <sfxtypes.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "versdlg.hxx"
-#include "sfx2/strings.hrc"
+#include <versdlg.hxx>
+#include <sfx2/strings.hrc>
 #include <sfx2/docfac.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/sfxhelp.hxx>
@@ -95,9 +95,9 @@
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 
-#include "helpids.h"
+#include <helpids.h>
 
-#include "guisaveas.hxx"
+#include <guisaveas.hxx>
 #include <sfx2/saveastemplatedlg.hxx>
 #include <memory>
 #include <cppuhelper/implbase.hxx>
@@ -115,7 +115,7 @@ using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::task;
 
 #define SfxObjectShell
-#include "sfxslots.hxx"
+#include <sfxslots.hxx>
 
 SFX_IMPL_SUPERCLASS_INTERFACE(SfxObjectShell, SfxShell)
 
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index abd772d0fe73..d93947511060 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -110,22 +110,22 @@
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfac.hxx>
-#include "appopen.hxx"
-#include "objshimp.hxx"
-#include "sfxtypes.hxx"
-#include "sfx2/strings.hrc"
+#include <appopen.hxx>
+#include <objshimp.hxx>
+#include <sfxtypes.hxx>
+#include <sfx2/strings.hrc>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/module.hxx>
 #include <sfx2/dispatch.hxx>
-#include "openflag.hxx"
-#include "helper.hxx"
+#include <openflag.hxx>
+#include <helper.hxx>
 #include <sfx2/event.hxx>
-#include "fltoptint.hxx"
+#include <fltoptint.hxx>
 #include <sfx2/viewfrm.hxx>
 #include "graphhelp.hxx"
-#include "appbaslib.hxx"
-#include "appdata.hxx"
-#include <objstor.hxx>
+#include <appbaslib.hxx>
+#include <appdata.hxx>
+#include "objstor.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::container;
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 738ea5e10f71..5c35ef09b3c6 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -19,7 +19,7 @@
 
 #include <config_features.h>
 
-#include "arrdecl.hxx"
+#include <arrdecl.hxx>
 #include <map>
 
 #include <cppuhelper/implbase.hxx>
@@ -80,19 +80,19 @@
 #include <sfx2/viewsh.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/sfxresid.hxx>
-#include "objshimp.hxx"
-#include "sfxtypes.hxx"
+#include <objshimp.hxx>
+#include <sfxtypes.hxx>
 #include <sfx2/evntconf.hxx>
 #include <sfx2/request.hxx>
-#include "sfx2/strings.hrc"
-#include "appdata.hxx"
+#include <sfx2/strings.hrc>
+#include <appdata.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <basic/basmgr.hxx>
 #include <svtools/strings.hrc>
 #include <sfx2/QuerySaveDocument.hxx>
-#include "helpids.h"
+#include <helpids.h>
 #include <sfx2/msg.hxx>
-#include "appbaslib.hxx"
+#include <appbaslib.hxx>
 #include <sfx2/sfxbasemodel.hxx>
 #include <shellimpl.hxx>
 #include <sfx2/notebookbar/SfxNotebookBar.hxx>
@@ -108,7 +108,7 @@ using namespace ::com::sun::star::document;
 using ::basic::BasicManagerRepository;
 #include <uno/mapping.hxx>
 
-#include "sfxslots.hxx"
+#include <sfxslots.hxx>
 
 namespace {
 
diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx
index 521dd77ae19b..9eef613c96e5 100644
--- a/sfx2/source/doc/querytemplate.cxx
+++ b/sfx2/source/doc/querytemplate.cxx
@@ -20,8 +20,8 @@
 
 #include "querytemplate.hxx"
 #include <sfx2/sfxresid.hxx>
-#include "sfx2/strings.hrc"
-#include "helpids.h"
+#include <sfx2/strings.hrc>
+#include <helpids.h>
 #include <vcl/svapp.hxx>
 
 namespace sfx2
diff --git a/sfx2/source/doc/saveastemplatedlg.cxx b/sfx2/source/doc/saveastemplatedlg.cxx
index 68d14d5a2a8a..8096f60b9de9 100644
--- a/sfx2/source/doc/saveastemplatedlg.cxx
+++ b/sfx2/source/doc/saveastemplatedlg.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/frame/DocumentTemplates.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::frame;
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 65427284b637..0e3fbef0ec85 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -89,7 +89,7 @@
 
 #include <sfx2/sfxbasecontroller.hxx>
 #include <sfx2/viewfac.hxx>
-#include "workwin.hxx"
+#include <workwin.hxx>
 #include <sfx2/signaturestate.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <objshimp.hxx>
@@ -106,13 +106,13 @@
 #include <sfx2/evntconf.hxx>
 #include <sfx2/strings.hrc>
 #include <sfx2/app.hxx>
-#include "appdata.hxx"
+#include <appdata.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/docstoragemodifylistener.hxx>
 #include <sfx2/brokenpackageint.hxx>
 #include "graphhelp.hxx"
-#include "docundomanager.hxx"
+#include <docundomanager.hxx>
 #include <openurlhint.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/DocumentMetadataAccess.hxx>
diff --git a/sfx2/source/doc/syspath.cxx b/sfx2/source/doc/syspath.cxx
index 44525e5fcbf4..23885aade2e6 100644
--- a/sfx2/source/doc/syspath.cxx
+++ b/sfx2/source/doc/syspath.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "syspath.hxx"
-#include <syspathw32.hxx>
+#include "syspathw32.hxx"
 
 bool SystemPath::GetUserTemplateLocation( sal_Unicode* pFolder, int nSize )
 {
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 2616ad998659..c5612f1b6c0b 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -10,8 +10,8 @@
 #include <sfx2/templatedlg.hxx>
 
 #include <sfx2/inputdlg.hxx>
-#include "templatesearchview.hxx"
-#include "templatesearchviewitem.hxx"
+#include <templatesearchview.hxx>
+#include <templatesearchviewitem.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
@@ -57,8 +57,8 @@
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
 
-#include "sfx2/strings.hrc"
-#include "bitmaps.hlst"
+#include <sfx2/strings.hrc>
+#include <bitmaps.hlst>
 
 const char TM_SETTING_MANAGER[] = "TemplateManager";
 const char TM_SETTING_LASTFOLDER[] = "LastFolder";
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 4c9f16e36a3c..23f9fbf07fdf 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -29,7 +29,7 @@
 #include <sfx2/app.hxx>
 #include <o3tl/enumarray.hxx>
 
-#include "bitset.hxx"
+#include <bitset.hxx>
 #include <memory>
 #include <vector>
 
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index 42c619c70de3..b47a49260d46 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -27,10 +27,10 @@
 #include <unotools/securityoptions.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/docmacromode.hxx>
-#include "bitset.hxx"
+#include <bitset.hxx>
 #include <vcl/timer.hxx>
 
-#include <appbaslib.hxx>
+#include "appbaslib.hxx"
 
 namespace svtools { class AsynchronLink; }
 
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 784ebd37a3ec..1afd15f5ab90 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "inettbc.hxx"
+#include <inettbc.hxx>
 
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/frame/Desktop.hpp>
@@ -42,8 +42,8 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objsh.hxx>
-#include "sfxtypes.hxx"
-#include "helper.hxx"
+#include <sfxtypes.hxx>
+#include <helper.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 87f77be978e6..216ef91b03ca 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -35,13 +35,13 @@
 #include <unotools/securityoptions.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/namedvaluecollection.hxx>
-#include "eventsupplier.hxx"
+#include <eventsupplier.hxx>
 
 #include <sfx2/app.hxx>
 #include <sfx2/sfxresid.hxx>
 
 #include <sfx2/sfxsids.hrc>
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include <sfx2/docfile.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/frame.hxx>
diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx
index 5c6ae4c77f1b..cd7d0653b5fa 100644
--- a/sfx2/source/notify/hintpost.cxx
+++ b/sfx2/source/notify/hintpost.cxx
@@ -19,9 +19,9 @@
 
 #include <sfx2/hintpost.hxx>
 
-#include "arrdecl.hxx"
+#include <arrdecl.hxx>
 #include <sfx2/app.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 
 
 SfxHintPoster::SfxHintPoster(const Link<SfxRequest*,void>& rLink)
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx
index 84515860814e..c9bc920ca277 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -22,7 +22,7 @@
 #include <sfx2/sidebar/SidebarChildWindow.hxx>
 #include <sfx2/sidebar/SidebarDockingWindow.hxx>
 #include <sfx2/sfxsids.hrc>
-#include "helpids.h"
+#include <helpids.h>
 #include <sfx2/dockwin.hxx>
 
 namespace sfx2 { namespace sidebar {
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index fb50b264fb5b..b0610ae203d9 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -33,11 +33,11 @@
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/titledockwin.hxx>
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include <framework/ContextChangeEventMultiplexerTunnel.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/fixed.hxx>
-#include "splitwin.hxx"
+#include <splitwin.hxx>
 #include <tools/link.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index d266f72c3ab0..bfd6f3b0feb0 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -31,7 +31,7 @@
 
 #include <sfx2/app.hxx>
 #include <sfx2/stbitem.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/msg.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/msgpool.hxx>
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 2ad6897e6f25..ac06a2f659e4 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -68,9 +68,9 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/msg.hxx>
 #include <sfx2/msgpool.hxx>
-#include "statcach.hxx"
+#include <statcach.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/docfile.hxx>
@@ -78,8 +78,8 @@
 #include <sfx2/frmhtmlw.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/unoctitm.hxx>
-#include "helpids.h"
-#include "workwin.hxx"
+#include <helpids.h>
+#include <workwin.hxx>
 #include <ctrlfactoryimpl.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 9c79959935c0..92abaca424d9 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -39,27 +39,27 @@
 #include <vcl/msgbox.hxx>
 
 // due to pTopFrames
-#include "appdata.hxx"
+#include <appdata.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/event.hxx>
 #include <sfx2/unoctitm.hxx>
 #include <sfx2/frame.hxx>
-#include "arrdecl.hxx"
+#include <arrdecl.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/frmdescr.hxx>
-#include "openflag.hxx"
+#include <openflag.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/fcontnr.hxx>
 #include "impframe.hxx"
-#include "workwin.hxx"
+#include <workwin.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/msgpool.hxx>
-#include "objshimp.hxx"
+#include <objshimp.hxx>
 #include <sfx2/ipclient.hxx>
 #include <childwinimpl.hxx>
 
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 5dc035fadf63..51763ea50f03 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -19,9 +19,9 @@
 
 
 #include "impframe.hxx"
-#include "objshimp.hxx"
+#include <objshimp.hxx>
 #include <sfx2/sfxhelp.hxx>
-#include "workwin.hxx"
+#include <workwin.hxx>
 
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index 7e699c13c053..a91543129e95 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -19,7 +19,7 @@
 
 
 #include <sal/macros.h>
-#include "objshimp.hxx"
+#include <objshimp.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/docfac.hxx>
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 78756c693762..1150ecc8e609 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -48,8 +48,8 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/dispatch.hxx>
-#include "workwin.hxx"
-#include "guisaveas.hxx"
+#include <workwin.hxx>
+#include <guisaveas.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <svtools/ehdl.hxx>
 
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index 8a677637d10a..5832ad9cd150 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -28,7 +28,7 @@
 
 #include <sfx2/printer.hxx>
 #include <sfx2/printopt.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/prnmon.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/tabdlg.hxx>
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index b82af1b29b9a..8dd2fabe54c3 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -55,7 +55,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/userinputinterception.hxx>
 
-#include <viewimp.hxx>
+#include "viewimp.hxx"
 #include <sfx2/unoctitm.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/sfxsids.hrc>
@@ -76,7 +76,7 @@
 #include <sfx2/event.hxx>
 #include <sfx2/viewfac.hxx>
 #include <sfx2/strings.hrc>
-#include "sfxbasecontroller_internal.hxx"
+#include <sfxbasecontroller_internal.hxx>
 
 #include <unordered_map>
 
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 77490ae2cb64..7bfb7694ad1b 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -100,17 +100,17 @@ using ::com::sun::star::document::XViewDataSupplier;
 using ::com::sun::star::container::XIndexContainer;
 
 // Due to ViewFrame::Current
-#include "appdata.hxx"
+#include <appdata.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
-#include "openflag.hxx"
-#include "objshimp.hxx"
+#include <openflag.hxx>
+#include <objshimp.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
-#include "arrdecl.hxx"
-#include "sfxtypes.hxx"
+#include <arrdecl.hxx>
+#include <sfxtypes.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/ipclient.hxx>
@@ -128,14 +128,14 @@ using ::com::sun::star::container::XIndexContainer;
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/progress.hxx>
 #include <sfx2/sidebar/Sidebar.hxx>
-#include "workwin.hxx"
-#include "helper.hxx"
+#include <workwin.hxx>
+#include <helper.hxx>
 #include <sfx2/minfitem.hxx>
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include "impviewframe.hxx"
 
 #define SfxViewFrame
-#include "sfxslots.hxx"
+#include <sfxslots.hxx>
 #undef SfxViewFrame
 
 SFX_IMPL_SUPERCLASS_INTERFACE(SfxViewFrame,SfxShell)
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 2c63fdcae93d..0357d90c987e 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -19,9 +19,9 @@
 
 
 #include "impviewframe.hxx"
-#include "statcach.hxx"
+#include <statcach.hxx>
 #include <sfx2/viewfac.hxx>
-#include "workwin.hxx"
+#include <workwin.hxx>
 
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 49e5ae6b34d4..904a5ea9fc38 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -42,7 +42,7 @@
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/objsh.hxx>
-#include "sfxtypes.hxx"
+#include <sfxtypes.hxx>
 #include <sfx2/event.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
@@ -50,7 +50,7 @@
 
 #include <toolkit/awt/vclxdevice.hxx>
 
-#include "helpids.h"
+#include <helpids.h>
 
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index f39c71d02691..61a8d822a20c 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -66,21 +66,21 @@
 #include <sfx2/printer.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/dispatch.hxx>
-#include "arrdecl.hxx"
+#include <arrdecl.hxx>
 #include <sfx2/docfac.hxx>
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include <sfx2/sfxbasecontroller.hxx>
 #include <sfx2/mailmodelapi.hxx>
-#include "bluthsndapi.hxx"
+#include <bluthsndapi.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/event.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/ipclient.hxx>
-#include "workwin.hxx"
+#include <workwin.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/lokhelper.hxx>
-#include "openuriexternally.hxx"
+#include <openuriexternally.hxx>
 #include <shellimpl.hxx>
 
 #include <vector>
@@ -94,7 +94,7 @@ using namespace ::com::sun::star::util;
 using namespace ::cppu;
 
 #define SfxViewShell
-#include "sfxslots.hxx"
+#include <sfxslots.hxx>
 
 
 class SfxClipboardChangeListener : public ::cppu::WeakImplHelper<