vcl: include vcl headers via triangular brackets instead of quotes

Change-Id: I311f7db622ce341527fe12a92b516f800b602f92

104 files changed, 300 insertions, 300 deletions

diff --git a/drawinglayer/source/processor2d/getdigitlanguage.cxx b/drawinglayer/source/processor2d/getdigitlanguage.cxx
index fff455c98cac..46a39db5ea98 100644
--- a/drawinglayer/source/processor2d/getdigitlanguage.cxx
+++ b/drawinglayer/source/processor2d/getdigitlanguage.cxx
@@ -11,8 +11,8 @@
 
 #include "i18nlangtag/lang.h"
 #include "svl/ctloptions.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/settings.hxx"
+#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
 
 #include "getdigitlanguage.hxx"
 
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index bbc861bc5d9c..7aacec27148e 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -47,7 +47,7 @@
 #include <editeng/escapementitem.hxx>
 #include <editeng/svxacorr.hxx>
 #include <editeng/unolingu.hxx>
-#include "vcl/window.hxx"
+#include <vcl/window.hxx>
 #include <helpid.hrc>
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/xml/sax/FastParser.hpp>
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index bc17bd168b39..b3618075e881 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -42,7 +42,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include "osl/mutex.hxx"
-#include "vcl/svapp.hxx"
+#include <vcl/svapp.hxx>
 
 using namespace     ::com::sun::star::container;
 using namespace     ::com::sun::star::lang;
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index 7f4de8f6d013..5751e05f6cd2 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -21,11 +21,11 @@
 #define INCLUDED_SD_SOURCE_UI_DLG_REMOTEDIALOGCLIENTBOX_HXX
 
 #include "rtl/ustring.hxx"
-#include "vcl/scrbar.hxx"
-#include "vcl/fixed.hxx"
-#include "vcl/button.hxx"
-#include "vcl/dialog.hxx"
-#include "vcl/field.hxx"
+#include <vcl/scrbar.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/button.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/field.hxx>
 
 #include "svtools/extensionlistbox.hxx"
 #include <cppuhelper/implbase.hxx>
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 842df16b3aa2..5c8f09f3cd6a 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -39,7 +39,7 @@
 #include <sfx2/dispatch.hxx>
 
 #include "MutexOwner.hxx"
-#include "vcl/svapp.hxx"
+#include <vcl/svapp.hxx>
 #include <osl/doublecheckedlocking.h>
 #include <osl/getglobalmutex.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 71beb04b409f..3eed5a6d3ecb 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -64,7 +64,7 @@
 #include "glob.hrc"
 #include "res_bmp.hrc"
 #include "sdresid.hxx"
-#include "vcl/canvastools.hxx"
+#include <vcl/canvastools.hxx>
 #include <vcl/settings.hxx>
 
 #include "comphelper/anytostring.hxx"
diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx
index 65c05c57cc38..5193ad3162e5 100644
--- a/sdext/source/presenter/PresenterButton.cxx
+++ b/sdext/source/presenter/PresenterButton.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "vcl/svapp.hxx"
+#include <vcl/svapp.hxx>
 #include "PresenterButton.hxx"
 #include "PresenterCanvasHelper.hxx"
 #include "PresenterController.hxx"
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index d1add25cd397..ad1e87398a2e 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "vcl/svapp.hxx"
-#include "vcl/settings.hxx"
+#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
 #include "PresenterHelpView.hxx"
 #include "PresenterButton.hxx"
 #include "PresenterCanvasHelper.hxx"
diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx
index 791c55bca828..914b356b2538 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "vcl/svapp.hxx"
-#include "vcl/settings.hxx"
+#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
 #include "PresenterNotesView.hxx"
 #include "PresenterButton.hxx"
 #include "PresenterCanvasHelper.hxx"
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index dea2b2be76cd..c67fc951698a 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "vcl/svapp.hxx"
+#include <vcl/svapp.hxx>
 #include "PresenterPaneBorderPainter.hxx"
 #include "PresenterCanvasHelper.hxx"
 #include "PresenterConfigurationAccess.hxx"
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
index 09882941553b..bad972f93f91 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -19,7 +19,7 @@
  */
 
 #include "PresenterSlideShowView.hxx"
-#include "vcl/svapp.hxx"
+#include <vcl/svapp.hxx>
 #include "PresenterCanvasHelper.hxx"
 #include "PresenterGeometryHelper.hxx"
 #include "PresenterHelper.hxx"
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 70f53b67e8f8..6e8716f2062c 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "vcl/svapp.hxx"
-#include "vcl/settings.hxx"
+#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
 
 #include "PresenterSlideSorter.hxx"
 #include "PresenterButton.hxx"
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index bbd179fd461b..50ad1922530a 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "vcl/svapp.hxx"
-#include "vcl/settings.hxx"
+#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
 #include "PresenterToolBar.hxx"
 
 #include "PresenterBitmapContainer.hxx"
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 349928ef5f96..3c93ae69eb75 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -20,8 +20,8 @@
 #undef ENABLE_PANE_RESIZING
 //#define ENABLE_PANE_RESIZING
 
-#include "vcl/svapp.hxx"
-#include "vcl/settings.hxx"
+#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
 #include "PresenterWindowManager.hxx"
 #include "PresenterController.hxx"
 #include "PresenterGeometryHelper.hxx"
diff --git a/svx/source/accessibility/lookupcolorname.cxx b/svx/source/accessibility/lookupcolorname.cxx
index 1e941b069a81..dafe833d4d70 100644
--- a/svx/source/accessibility/lookupcolorname.cxx
+++ b/svx/source/accessibility/lookupcolorname.cxx
@@ -31,7 +31,7 @@
 #include "comphelper/processfactory.hxx"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
-#include "vcl/svapp.hxx"
+#include <vcl/svapp.hxx>
 
 #include <lookupcolorname.hxx>
 #include <unordered_map>
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 59cd731a80f5..452a15f253c6 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "svx/relfld.hxx"
-#include "vcl/builderfactory.hxx"
+#include <vcl/builderfactory.hxx>
 
 SvxRelativeField::SvxRelativeField(
         vcl::Window *const pParent, WinBits const nBits, FieldUnit const eUnit)
diff --git a/sw/source/uibase/inc/navmgr.hxx b/sw/source/uibase/inc/navmgr.hxx
index 96288ba467db..9caf27cb6236 100644
--- a/sw/source/uibase/inc/navmgr.hxx
+++ b/sw/source/uibase/inc/navmgr.hxx
@@ -15,7 +15,7 @@
 #include "swtypes.hxx"
 #include "calbck.hxx"
 #include "unocrsr.hxx"
-#include "vcl/svapp.hxx"
+#include <vcl/svapp.hxx>
 
 class   SwWrtShell;
 struct  SwPosition;
diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx
index 62ebe1e2a792..0064dda518e4 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -20,7 +20,7 @@
 #include <sal/config.h>
 
 #include <boost/noncopyable.hpp>
-#include "vcl/svapp.hxx"
+#include <vcl/svapp.hxx>
 #include "osl/mutex.hxx"
 #include "cppuhelper/factory.hxx"
 #include "cppuhelper/implementationentry.hxx"
diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index 422da1ca578a..1d8557f6fc24 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "vcl/svapp.hxx"
-#include "vcl/timer.hxx"
-#include "vcl/printerinfomanager.hxx"
+#include <vcl/svapp.hxx>
+#include <vcl/timer.hxx>
+#include <vcl/printerinfomanager.hxx>
 
 #include "jobset.h"
 #include "print.h"
diff --git a/vcl/inc/headless/svpprn.hxx b/vcl/inc/headless/svpprn.hxx
index 61487e7a13f7..1c6d05d2069d 100644
--- a/vcl/inc/headless/svpprn.hxx
+++ b/vcl/inc/headless/svpprn.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_HEADLESS_SVPPRN_HXX
 #define INCLUDED_VCL_INC_HEADLESS_SVPPRN_HXX
 
-#include "vcl/jobdata.hxx"
+#include <vcl/jobdata.hxx>
 #include "unx/printergfx.hxx"
 #include "unx/printerjob.hxx"
 #include "unx/genprn.h"
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 69b24a8e1225..4eb0b019d5b6 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -22,7 +22,7 @@
 
 #include <vcl/opengl/OpenGLContext.hxx>
 
-#include "vcl/salbtype.hxx"
+#include <vcl/salbtype.hxx>
 #include "opengl/bmpop.hxx"
 #include "opengl/texture.hxx"
 
diff --git a/vcl/inc/osx/printview.h b/vcl/inc/osx/printview.h
index 22fafb6a3f81..83516c681336 100644
--- a/vcl/inc/osx/printview.h
+++ b/vcl/inc/osx/printview.h
@@ -24,7 +24,7 @@
 #include <Cocoa/Cocoa.h>
 #include "postmac.h"
 
-#include "vcl/print.hxx"
+#include <vcl/print.hxx>
 
 class AquaSalInfoPrinter;
 
diff --git a/vcl/inc/osx/saldata.hxx b/vcl/inc/osx/saldata.hxx
index 1ea8074e9b38..fbc28e05391d 100644
--- a/vcl/inc/osx/saldata.hxx
+++ b/vcl/inc/osx/saldata.hxx
@@ -28,7 +28,7 @@
 
 #include "com/sun/star/uno/Reference.hxx"
 
-#include "vcl/ptrstyle.hxx"
+#include <vcl/ptrstyle.hxx>
 
 #include "svdata.hxx"
 #include "salwtype.hxx"
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 360a2e9b39dd..ac885c9eb2da 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -24,7 +24,7 @@
 #include <IOKit/pwr_mgt/IOPMLib.h>
 #include <postmac.h>
 
-#include "vcl/sysdata.hxx"
+#include <vcl/sysdata.hxx>
 
 #include "osx/salmenu.h"
 #include "osx/saldata.hxx"
diff --git a/vcl/inc/osx/salobj.h b/vcl/inc/osx/salobj.h
index c963ead06be2..8dc316e6d9f0 100644
--- a/vcl/inc/osx/salobj.h
+++ b/vcl/inc/osx/salobj.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_OSX_SALOBJ_H
 #define INCLUDED_VCL_INC_OSX_SALOBJ_H
 
-#include "vcl/sysdata.hxx"
+#include <vcl/sysdata.hxx>
 #include "salobj.hxx"
 
 class AquaSalFrame;
diff --git a/vcl/inc/quartz/common.h b/vcl/inc/quartz/common.h
index 49c7e1a9282c..0037111985f8 100644
--- a/vcl/inc/quartz/common.h
+++ b/vcl/inc/quartz/common.h
@@ -42,7 +42,7 @@
 
 #define round_to_long(a) ((a) >= 0 ? ((long)((a) + 0.5)) : ((long)((a) - 0.5)))
 
-#include "vcl/salgtype.hxx"
+#include <vcl/salgtype.hxx>
 
 std::ostream &operator <<(std::ostream& s, CTFontRef pFont);
 
diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h
index 3166fd595b34..6ffd1e36ca50 100644
--- a/vcl/inc/quartz/salbmp.h
+++ b/vcl/inc/quartz/salbmp.h
@@ -22,7 +22,7 @@
 
 #include "tools/gen.hxx"
 
-#include "vcl/salbtype.hxx"
+#include <vcl/salbtype.hxx>
 
 #include "quartz/salgdi.h"
 
diff --git a/vcl/inc/unx/cupsmgr.hxx b/vcl/inc/unx/cupsmgr.hxx
index a022e22b5e4a..e7860e2f8f5c 100644
--- a/vcl/inc/unx/cupsmgr.hxx
+++ b/vcl/inc/unx/cupsmgr.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_UNX_CUPSMGR_HXX
 #define INCLUDED_VCL_INC_UNX_CUPSMGR_HXX
 
-#include "vcl/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
 #include "osl/module.h"
 #include "osl/thread.h"
 #include "osl/mutex.hxx"
diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h
index 7d34984b7b64..94a4046a08a0 100644
--- a/vcl/inc/unx/genprn.h
+++ b/vcl/inc/unx/genprn.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_GENERIC_GENPRN_H
 #define INCLUDED_VCL_INC_GENERIC_GENPRN_H
 
-#include "vcl/jobdata.hxx"
+#include <vcl/jobdata.hxx>
 #include "unx/printergfx.hxx"
 #include "unx/printerjob.hxx"
 #include "salprn.hxx"
diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx
index e820cd729eb7..d4807fe3c018 100644
--- a/vcl/inc/unx/printergfx.hxx
+++ b/vcl/inc/unx/printergfx.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_GENERIC_PRINTERGFX_HXX
 #define INCLUDED_VCL_INC_GENERIC_PRINTERGFX_HXX
 
-#include "vcl/helper.hxx"
+#include <vcl/helper.hxx>
 #include "sallayout.hxx"
 #include "osl/file.hxx"
 #include "tools/gen.hxx"
diff --git a/vcl/inc/unx/printerjob.hxx b/vcl/inc/unx/printerjob.hxx
index af9ee71632ca..8f283cdaff1d 100644
--- a/vcl/inc/unx/printerjob.hxx
+++ b/vcl/inc/unx/printerjob.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_GENERIC_PRINTERJOB_HXX
 #define INCLUDED_VCL_INC_GENERIC_PRINTERJOB_HXX
 
-#include "vcl/jobdata.hxx"
+#include <vcl/jobdata.hxx>
 #include "osl/file.hxx"
 #include "rtl/string.hxx"
 
diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx
index 04539b315373..e79701e0cdbb 100644
--- a/vcl/null/printerinfomanager.cxx
+++ b/vcl/null/printerinfomanager.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "vcl/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
 
 #include "unx/gendata.hxx"
 
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 07ec676a1cdd..0ed06b6dec86 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -21,14 +21,14 @@
 
 #include <vcl/opengl/OpenGLHelper.hxx>
 
-#include "vcl/bitmap.hxx"
-#include "vcl/checksum.hxx"
-#include "vcl/outdev.hxx"
-#include "vcl/salbtype.hxx"
+#include <vcl/bitmap.hxx>
+#include <vcl/checksum.hxx>
+#include <vcl/outdev.hxx>
+#include <vcl/salbtype.hxx>
 #include "svdata.hxx"
 #include "salgdi.hxx"
 #include "vcleventlisteners.hxx"
-#include "vcl/lazydelete.hxx"
+#include <vcl/lazydelete.hxx>
 
 #include <o3tl/make_shared.hxx>
 
diff --git a/vcl/opengl/scale.cxx b/vcl/opengl/scale.cxx
index 9ba74323c8c1..00a2894ad48d 100644
--- a/vcl/opengl/scale.cxx
+++ b/vcl/opengl/scale.cxx
@@ -21,7 +21,7 @@
 
 #include <vcl/opengl/OpenGLHelper.hxx>
 
-#include "vcl/bitmap.hxx"
+#include <vcl/bitmap.hxx>
 
 #include "opengl/zone.hxx"
 #include "opengl/salbmp.hxx"
diff --git a/vcl/osx/a11yfocustracker.cxx b/vcl/osx/a11yfocustracker.cxx
index 03eabfa7cfdc..4bee41fab4ee 100644
--- a/vcl/osx/a11yfocustracker.cxx
+++ b/vcl/osx/a11yfocustracker.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "vcl/svapp.hxx"
-#include "vcl/window.hxx"
-#include "vcl/toolbox.hxx"
-#include "vcl/menu.hxx"
+#include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
+#include <vcl/toolbox.hxx>
+#include <vcl/menu.hxx>
 
 #include "osx/a11yfocustracker.hxx"
 
diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index 80885f82de66..8d2ef5b231b6 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -21,11 +21,11 @@
 
 #include "tools/resary.hxx"
 
-#include "vcl/print.hxx"
-#include "vcl/image.hxx"
-#include "vcl/virdev.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/unohelp.hxx"
+#include <vcl/print.hxx>
+#include <vcl/image.hxx>
+#include <vcl/virdev.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
 #include <vcl/settings.hxx>
 
 #include "osx/printview.h"
diff --git a/vcl/osx/printview.mm b/vcl/osx/printview.mm
index 3fef61d19805..51b9b5ad04e7 100644
--- a/vcl/osx/printview.mm
+++ b/vcl/osx/printview.mm
@@ -18,7 +18,7 @@
  */
 
 
-#include "vcl/print.hxx"
+#include <vcl/print.hxx>
 
 #include "osx/printview.h"
 #include "osx/salprn.h"
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index d83a80cb7504..832d1328fcf9 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -24,9 +24,9 @@
 
 #include "osl/file.h"
 
-#include "vcl/svapp.hxx"
-#include "vcl/window.hxx"
-#include "vcl/syswin.hxx"
+#include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
+#include <vcl/syswin.hxx>
 #include <vcl/settings.hxx>
 
 #include "osx/saldata.hxx"
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 63b8e0585fc7..98b11b1d83a5 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -29,11 +29,11 @@
 
 #include "rtl/ustrbuf.hxx"
 
-#include "vcl/svapp.hxx"
-#include "vcl/window.hxx"
-#include "vcl/idle.hxx"
-#include "vcl/svmain.hxx"
-#include "vcl/opengl/OpenGLContext.hxx"
+#include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
+#include <vcl/idle.hxx>
+#include <vcl/svmain.hxx>
+#include <vcl/opengl/OpenGLContext.hxx>
 
 #include "osx/saldata.hxx"
 #include "osx/salinst.h"
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index b5f738831419..757ac2cfe85c 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -19,10 +19,10 @@
 
 #include <config_features.h>
 
-#include "vcl/salnativewidgets.hxx"
-#include "vcl/decoview.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/timer.hxx"
+#include <vcl/salnativewidgets.hxx>
+#include <vcl/decoview.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/timer.hxx>
 #include <vcl/settings.hxx>
 
 #include "quartz/salgdi.h"
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index 54e3e8f8b946..3ec863109cae 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -21,7 +21,7 @@
 
 #include "officecfg/Office/Common.hxx"
 
-#include "vcl/print.hxx"
+#include <vcl/print.hxx>
 #include <sal/macros.h>
 
 #include "osx/salinst.h"
diff --git a/vcl/osx/salsys.cxx b/vcl/osx/salsys.cxx
index 72f41327fe86..d0ed61554bf8 100644
--- a/vcl/osx/salsys.cxx
+++ b/vcl/osx/salsys.cxx
@@ -19,7 +19,7 @@
 
 #include "rtl/ustrbuf.hxx"
 
-#include "vcl/button.hxx"
+#include <vcl/button.hxx>
 
 #include "osx/salsys.h"
 #include "osx/saldata.hxx"
diff --git a/vcl/osx/service_entry.cxx b/vcl/osx/service_entry.cxx
index 3679d9726459..ba863013d68d 100644
--- a/vcl/osx/service_entry.cxx
+++ b/vcl/osx/service_entry.cxx
@@ -19,7 +19,7 @@
 
 #include "osl/diagnose.h"
 
-#include "vcl/svapp.hxx"
+#include <vcl/svapp.hxx>
 
 #include "osx/saldata.hxx"
 #include "osx/salinst.h"
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index 8b79f650decc..8076d2b0384b 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -32,13 +32,13 @@
 #include <tools/diagnose_ex.h>
 #include <rtl/ref.hxx>
 
-#include "vcl/svapp.hxx"
-#include "vcl/canvastools.hxx"
-#include "vcl/dialog.hxx"
-#include "vcl/outdev.hxx"
-#include "vcl/bitmapaccess.hxx"
-#include "vcl/virdev.hxx"
-#include "vcl/bitmapex.hxx"
+#include <vcl/svapp.hxx>
+#include <vcl/canvastools.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/outdev.hxx>
+#include <vcl/bitmapaccess.hxx>
+#include <vcl/virdev.hxx>
+#include <vcl/bitmapex.hxx>
 
 #include "canvasbitmap.hxx"
 #include <algorithm>
diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index c09dd449e289..3110398b8784 100644
--- a/vcl/quartz/salvd.cxx
+++ b/vcl/quartz/salvd.cxx
@@ -19,8 +19,8 @@
 
 #include <sal/config.h>
 
-#include "vcl/svapp.hxx"
-#include "vcl/sysdata.hxx"
+#include <vcl/svapp.hxx>
+#include <vcl/sysdata.hxx>
 
 #ifdef MACOSX
 #include "osx/salinst.h"
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 7e53c09d8ffa..b191ae9a5b9d 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -27,9 +27,9 @@
 #include <tools/lineend.hxx>
 #include "sal/log.hxx"
 
-#include "vcl/svapp.hxx"
-#include "vcl/event.hxx"
-#include "vcl/threadex.hxx"
+#include <vcl/svapp.hxx>
+#include <vcl/event.hxx>
+#include <vcl/threadex.hxx>
 
 #include "svdata.hxx"
 #include "dbggui.hxx"
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index f48f6c59b15e..cf3726b230e9 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -23,12 +23,12 @@
 #include "tools/diagnose_ex.h"
 #include "tools/time.hxx"
 
-#include "vcl/window.hxx"
-#include "vcl/event.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/wrkwin.hxx"
-#include "vcl/help.hxx"
-#include "vcl/settings.hxx"
+#include <vcl/window.hxx>
+#include <vcl/event.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/help.hxx>
+#include <vcl/settings.hxx>
 
 #include "helpwin.hxx"
 #include "salframe.hxx"
diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx
index 03d1bed10ad0..d59fdc46eff2 100644
--- a/vcl/source/app/i18nhelp.cxx
+++ b/vcl/source/app/i18nhelp.cxx
@@ -25,7 +25,7 @@
 
 #include "rtl/ustrbuf.hxx"
 
-#include "vcl/i18nhelp.hxx"
+#include <vcl/i18nhelp.hxx>
 
 #include "com/sun/star/lang/XMultiServiceFactory.hpp"
 #include "com/sun/star/i18n/TransliterationModules.hpp"
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index fbde610f62f0..c3fbdf518612 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -28,15 +28,15 @@
 #include <tools/gen.hxx>
 #include <uno/current_context.hxx>
 
-#include "vcl/configsettings.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/settings.hxx"
-#include "vcl/wrkwin.hxx"
-#include "vcl/layout.hxx"
-#include "vcl/button.hxx"
-#include "vcl/dockwin.hxx"
-#include "vcl/print.hxx"
-#include "vcl/virdev.hxx"
+#include <vcl/configsettings.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/layout.hxx>
+#include <vcl/button.hxx>
+#include <vcl/dockwin.hxx>
+#include <vcl/print.hxx>
+#include <vcl/virdev.hxx>
 #include "salinst.hxx"
 #include "salframe.hxx"
 #include "salgdi.hxx"
@@ -52,7 +52,7 @@
 
 #include "officecfg/Office/Common.hxx"
 
-#include "vcl/opengl/OpenGLContext.hxx"
+#include <vcl/opengl/OpenGLContext.hxx>
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx
index f1bf0f704168..da87732e67e4 100644
--- a/vcl/source/app/vclevent.cxx
+++ b/vcl/source/app/vclevent.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "vcl/vclevent.hxx"
-#include "vcl/window.hxx"
+#include <vcl/vclevent.hxx>
+#include <vcl/window.hxx>
 
 #include "svdata.hxx"
 #include "vcleventlisteners.hxx"
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index 18a104db05b6..0ae1f7ff4467 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -19,7 +19,7 @@
 
 #include "osl/mutex.hxx"
 
-#include "vcl/svapp.hxx"
+#include <vcl/svapp.hxx>
 
 #include "factory.hxx"
 #include "svdata.hxx"
diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx
index 10acf82a32a4..3315e1b937db 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "vcl/svapp.hxx"
-#include "vcl/font.hxx"
+#include <vcl/svapp.hxx>
+#include <vcl/font.hxx>
 
 #include "factory.hxx"
 #include "svdata.hxx"
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 3b6b5b106190..99ac514401ec 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -26,11 +26,11 @@
 
 #include "tools/rc.h"
 
-#include "vcl/dialog.hxx"
-#include "vcl/field.hxx"
-#include "vcl/event.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/settings.hxx"
+#include <vcl/dialog.hxx>
+#include <vcl/field.hxx>
+#include <vcl/event.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
 
 #include "svids.hrc"
 #include "svdata.hxx"
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index a5f9e95d60f0..2c0a62a0ac87 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -19,13 +19,13 @@
 
 #include "tools/rc.h"
 
-#include "vcl/decoview.hxx"
-#include "vcl/dialog.hxx"
-#include "vcl/event.hxx"
-#include "vcl/fixed.hxx"
-#include "vcl/implimagetree.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/settings.hxx"
+#include <vcl/decoview.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/event.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/implimagetree.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
 
 #include <comphelper/string.hxx>
 #include "controldata.hxx"
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index aa4f16e61d57..e7cc02617fe6 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -20,15 +20,15 @@
 #include "tools/rc.h"
 #include "tools/debug.hxx"
 
-#include "vcl/decoview.hxx"
-#include "vcl/dialog.hxx"
-#include "vcl/event.hxx"
-#include "vcl/scrbar.hxx"
-#include "vcl/button.hxx"
-#include "vcl/edit.hxx"
-#include "vcl/lstbox.hxx"
-#include "vcl/combobox.hxx"
-#include "vcl/settings.hxx"
+#include <vcl/decoview.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/event.hxx>
+#include <vcl/scrbar.hxx>
+#include <vcl/button.hxx>
+#include <vcl/edit.hxx>
+#include <vcl/lstbox.hxx>
+#include <vcl/combobox.hxx>
+#include <vcl/settings.hxx>
 
 #include "svdata.hxx"
 #include "controldata.hxx"
diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx
index dc0e8117fc19..e8d40756830f 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "vcl/quickselectionengine.hxx"
-#include "vcl/event.hxx"
-#include "vcl/timer.hxx"
-#include "vcl/i18nhelp.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/settings.hxx"
+#include <vcl/quickselectionengine.hxx>
+#include <vcl/event.hxx>
+#include <vcl/timer.hxx>
+#include <vcl/i18nhelp.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
 
 #include <boost/optional.hpp>
 
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 5d44cd7e9eed..485d613afabd 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "vcl/event.hxx"
-#include "vcl/decoview.hxx"
-#include "vcl/scrbar.hxx"
-#include "vcl/timer.hxx"
-#include "vcl/settings.hxx"
+#include <vcl/event.hxx>
+#include <vcl/decoview.hxx>
+#include <vcl/scrbar.hxx>
+#include <vcl/timer.hxx>
+#include <vcl/settings.hxx>
 
 #include "svdata.hxx"
 
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index c95bf29b1e2c..cc57cb851f19 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -19,10 +19,10 @@
 
 #include "tools/rc.h"
 
-#include "vcl/event.hxx"
-#include "vcl/decoview.hxx"
-#include "vcl/spinfld.hxx"
-#include "vcl/settings.hxx"
+#include <vcl/event.hxx>
+#include <vcl/decoview.hxx>
+#include <vcl/spinfld.hxx>
+#include <vcl/settings.hxx>
 
 #include "controldata.hxx"
 #include "spin.hxx"
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index d848ab04d945..40a107d39381 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -20,17 +20,17 @@
 #include "tools/debug.hxx"
 #include "tools/rc.h"
 
-#include "vcl/svapp.hxx"
-#include "vcl/help.hxx"
-#include "vcl/event.hxx"
-#include "vcl/menu.hxx"
-#include "vcl/button.hxx"
-#include "vcl/tabpage.hxx"
-#include "vcl/tabctrl.hxx"
-#include "vcl/controllayout.hxx"
-#include "vcl/layout.hxx"
-#include "vcl/lstbox.hxx"
-#include "vcl/settings.hxx"
+#include <vcl/svapp.hxx>
+#include <vcl/help.hxx>
+#include <vcl/event.hxx>
+#include <vcl/menu.hxx>
+#include <vcl/button.hxx>
+#include <vcl/tabpage.hxx>
+#include <vcl/tabctrl.hxx>
+#include <vcl/controllayout.hxx>
+#include <vcl/layout.hxx>
+#include <vcl/lstbox.hxx>
+#include <vcl/settings.hxx>
 
 #include "controldata.hxx"
 #include "svdata.hxx"
diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx
index dff1a7cd9c02..f0c17c5526f4 100644
--- a/vcl/source/control/throbber.cxx
+++ b/vcl/source/control/throbber.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "vcl/throbber.hxx"
-#include "vcl/svapp.hxx"
+#include <vcl/throbber.hxx>
+#include <vcl/svapp.hxx>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/graphic/GraphicProvider.hpp>
diff --git a/vcl/source/gdi/oldprintadaptor.cxx b/vcl/source/gdi/oldprintadaptor.cxx
index ef4250555ffa..2c0fedd478a8 100644
--- a/vcl/source/gdi/oldprintadaptor.cxx
+++ b/vcl/source/gdi/oldprintadaptor.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "vcl/oldprintadaptor.hxx"
-#include "vcl/gdimtf.hxx"
+#include <vcl/oldprintadaptor.hxx>
+#include <vcl/gdimtf.hxx>
 
 #include "com/sun/star/awt/Size.hpp"
 
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index 2030b3a011f6..247176bb430e 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "vcl/pdfextoutdevdata.hxx"
-#include "vcl/graph.hxx"
-#include "vcl/outdev.hxx"
-#include "vcl/gfxlink.hxx"
+#include <vcl/pdfextoutdevdata.hxx>
+#include <vcl/graph.hxx>
+#include <vcl/outdev.hxx>
+#include <vcl/gfxlink.hxx>
 #include "vcl/dllapi.h"
 #include "basegfx/polygon/b2dpolygon.hxx"
 #include "basegfx/polygon/b2dpolygontools.hxx"
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index bad799439e6c..991d364ac869 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -19,12 +19,12 @@
 
 #include "pdfwriter_impl.hxx"
 
-#include "vcl/pdfextoutdevdata.hxx"
-#include "vcl/virdev.hxx"
-#include "vcl/gdimtf.hxx"
-#include "vcl/metaact.hxx"
-#include "vcl/bitmapaccess.hxx"
-#include "vcl/graph.hxx"
+#include <vcl/pdfextoutdevdata.hxx>
+#include <vcl/virdev.hxx>
+#include <vcl/gdimtf.hxx>
+#include <vcl/metaact.hxx>
+#include <vcl/bitmapaccess.hxx>
+#include <vcl/graph.hxx>
 
 #include "svdata.hxx"
 
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index 79f983f79569..0b7ac697f8b0 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "vcl/ctrl.hxx"
-#include "vcl/outdev.hxx"
+#include <vcl/ctrl.hxx>
+#include <vcl/outdev.hxx>
 
 #include "fontinstance.hxx"
 #include "textlayout.hxx"
diff --git a/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx
index 6ca54bbeab99..2733aa0d369e 100644
--- a/vcl/source/helper/lazydelete.cxx
+++ b/vcl/source/helper/lazydelete.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "vcl/window.hxx"
-#include "vcl/menu.hxx"
-#include "vcl/lazydelete.hxx"
+#include <vcl/window.hxx>
+#include <vcl/menu.hxx>
+#include <vcl/lazydelete.hxx>
 #include "svdata.hxx"
 
 namespace vcl {
diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx
index 65271087f024..67b2f611398e 100644
--- a/vcl/source/helper/strhelper.cxx
+++ b/vcl/source/helper/strhelper.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "vcl/strhelper.hxx"
+#include <vcl/strhelper.hxx>
 #include "sal/alloca.h"
 
 namespace psp {
diff --git a/vcl/source/helper/xconnection.cxx b/vcl/source/helper/xconnection.cxx
index ad420d303221..45e5008ffe02 100644
--- a/vcl/source/helper/xconnection.cxx
+++ b/vcl/source/helper/xconnection.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "vcl/svapp.hxx"
+#include <vcl/svapp.hxx>
 
 #include "xconnection.hxx"
 #include "svdata.hxx"
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index 6726673c867d..bb14b629bdb6 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -38,12 +38,12 @@
 
 #include "tools/stream.hxx"
 #include "tools/urlobj.hxx"
-#include "vcl/bitmapex.hxx"
+#include <vcl/bitmapex.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/implimagetree.hxx>
-#include "vcl/pngread.hxx"
-#include "vcl/settings.hxx"
-#include "vcl/svapp.hxx"
+#include <vcl/pngread.hxx>
+#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
 #include <vcldemo-debug.hxx>
 
 #include <vcl/BitmapProcessor.hxx>
diff --git a/vcl/source/salmain/salmain.cxx b/vcl/source/salmain/salmain.cxx
index 32d573703a20..da2b37e7321f 100644
--- a/vcl/source/salmain/salmain.cxx
+++ b/vcl/source/salmain/salmain.cxx
@@ -23,8 +23,8 @@
 
 #include "sal/main.h"
 #include "tools/extendapplicationenvironment.hxx"
-#include "vcl/vclmain.hxx"
-#include "vcl/svmain.hxx"
+#include <vcl/vclmain.hxx>
+#include <vcl/svmain.hxx>
 
 #include "salinst.hxx"
 
diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx
index e3aa32a86a7f..0fcd51843cbe 100644
--- a/vcl/source/window/accessibility.cxx
+++ b/vcl/source/window/accessibility.cxx
@@ -28,34 +28,34 @@
 #include "unotools/fontcfg.hxx"
 #include "unotools/confignode.hxx"
 
-#include "vcl/layout.hxx"
-#include "vcl/salgtype.hxx"
-#include "vcl/event.hxx"
-#include "vcl/fixed.hxx"
-#include "vcl/help.hxx"
-#include "vcl/cursor.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/window.hxx"
-#include "vcl/syswin.hxx"
-#include "vcl/syschild.hxx"
-#include "vcl/dockwin.hxx"
-#include "vcl/menu.hxx"
-#include "vcl/wrkwin.hxx"
-#include "vcl/wall.hxx"
-#include "vcl/gradient.hxx"
-#include "vcl/button.hxx"
-#include "vcl/taskpanelist.hxx"
-#include "vcl/dialog.hxx"
-#include "vcl/unowrap.hxx"
-#include "vcl/gdimtf.hxx"
-#include "vcl/pdfextoutdevdata.hxx"
-#include "vcl/popupmenuwindow.hxx"
-#include "vcl/lazydelete.hxx"
-#include "vcl/virdev.hxx"
-#include "vcl/settings.hxx"
+#include <vcl/layout.hxx>
+#include <vcl/salgtype.hxx>
+#include <vcl/event.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/help.hxx>
+#include <vcl/cursor.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
+#include <vcl/syswin.hxx>
+#include <vcl/syschild.hxx>
+#include <vcl/dockwin.hxx>
+#include <vcl/menu.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/wall.hxx>
+#include <vcl/gradient.hxx>
+#include <vcl/button.hxx>
+#include <vcl/taskpanelist.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/unowrap.hxx>
+#include <vcl/gdimtf.hxx>
+#include <vcl/pdfextoutdevdata.hxx>
+#include <vcl/popupmenuwindow.hxx>
+#include <vcl/lazydelete.hxx>
+#include <vcl/virdev.hxx>
+#include <vcl/settings.hxx>
 
 // declare system types in sysdata.hxx
-#include "vcl/sysdata.hxx"
+#include <vcl/sysdata.hxx>
 
 #include "salframe.hxx"
 #include "salobj.hxx"
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 8fe500112a5c..3be6868a9117 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -63,7 +63,7 @@
 #include <vcl/unohelp.hxx>
 #include <vcl/configsettings.hxx>
 
-#include "vcl/lazydelete.hxx"
+#include <vcl/lazydelete.hxx>
 
 #include <sfx2/sfxsids.hrc>
 
diff --git a/vcl/source/window/popupmenuwindow.cxx b/vcl/source/window/popupmenuwindow.cxx
index 2d9c52699054..e9388732ae6c 100644
--- a/vcl/source/window/popupmenuwindow.cxx
+++ b/vcl/source/window/popupmenuwindow.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "vcl/popupmenuwindow.hxx"
+#include <vcl/popupmenuwindow.hxx>
 
 #include <limits>
 
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 67b0acd970b0..7cca69c45099 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -22,19 +22,19 @@
 #include "svids.hrc"
 #include "jobset.h"
 
-#include "vcl/print.hxx"
-#include "vcl/dialog.hxx"
-#include "vcl/button.hxx"
-#include "vcl/wall.hxx"
-#include "vcl/status.hxx"
-#include "vcl/decoview.hxx"
-#include "vcl/configsettings.hxx"
-#include "vcl/help.hxx"
-#include "vcl/layout.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/unohelp.hxx"
-#include "vcl/settings.hxx"
-#include "vcl/builderfactory.hxx"
+#include <vcl/print.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/button.hxx>
+#include <vcl/wall.hxx>
+#include <vcl/status.hxx>
+#include <vcl/decoview.hxx>
+#include <vcl/configsettings.hxx>
+#include <vcl/help.hxx>
+#include <vcl/layout.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
+#include <vcl/settings.hxx>
+#include <vcl/builderfactory.hxx>
 
 #include "unotools/localedatawrapper.hxx"
 
diff --git a/vcl/source/window/window3.cxx b/vcl/source/window/window3.cxx
index aa2a04919663..aa5c1f9d3ab9 100644
--- a/vcl/source/window/window3.cxx
+++ b/vcl/source/window/window3.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "vcl/window.hxx"
-#include "vcl/waitobj.hxx"
-#include "vcl/button.hxx"
+#include <vcl/window.hxx>
+#include <vcl/waitobj.hxx>
+#include <vcl/button.hxx>
 
 WaitObject::~WaitObject()
 {
diff --git a/vcl/unx/generic/app/gensys.cxx b/vcl/unx/generic/app/gensys.cxx
index 32c0e09ffbf5..f58328d60898 100644
--- a/vcl/unx/generic/app/gensys.cxx
+++ b/vcl/unx/generic/app/gensys.cxx
@@ -33,7 +33,7 @@
 #include <osl/thread.h>
 #include <unotools/configmgr.hxx>
 
-#include "vcl/unohelp.hxx"
+#include <vcl/unohelp.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index 2f8d250a2bd3..26ddf87a0cc6 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -27,7 +27,7 @@
 #include "osl/thread.h"
 #include "osl/process.h"
 #include <sal/macros.h>
-#include "vcl/configsettings.hxx"
+#include <vcl/configsettings.hxx>
 
 #include "unx/wmadaptor.hxx"
 #include "unx/saldisp.hxx"
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 1f7d39da63ec..1b2cb43c5604 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -48,7 +48,7 @@
 #include <X11_dndcontext.hxx>
 #include <bmp.hxx>
 
-#include "vcl/svapp.hxx"
+#include <vcl/svapp.hxx>
 
 // pointer bitmaps
 #include <copydata_curs.h>
diff --git a/vcl/unx/generic/dtrans/bmp.cxx b/vcl/unx/generic/dtrans/bmp.cxx
index e156f590b575..8d3bdee36c0d 100644
--- a/vcl/unx/generic/dtrans/bmp.cxx
+++ b/vcl/unx/generic/dtrans/bmp.cxx
@@ -30,7 +30,7 @@
 #include <tools/stream.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/svapp.hxx>
-#include "vcl/bitmap.hxx"
+#include <vcl/bitmap.hxx>
 
 using namespace x11;
 
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 102375016f80..ffa7f9756e12 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -31,8 +31,8 @@
 #include "svdata.hxx"
 #include "unx/geninst.h"
 #include "unx/fontmanager.hxx"
-#include "vcl/strhelper.hxx"
-#include "vcl/ppdparser.hxx"
+#include <vcl/strhelper.hxx>
+#include <vcl/ppdparser.hxx>
 #include <vcl/embeddedfontshelper.hxx>
 #include <vcl/fontcharmap.hxx>
 
diff --git a/vcl/unx/generic/fontmanager/helper.cxx b/vcl/unx/generic/fontmanager/helper.cxx
index af8ae0aedeaa..a8c35b8a2147 100644
--- a/vcl/unx/generic/fontmanager/helper.cxx
+++ b/vcl/unx/generic/fontmanager/helper.cxx
@@ -29,8 +29,8 @@
 #include <rtl/bootstrap.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/urlobj.hxx>
-#include "vcl/helper.hxx"
-#include "vcl/ppdparser.hxx"
+#include <vcl/helper.hxx>
+#include <vcl/ppdparser.hxx>
 #include <memory>
 
 using ::rtl::Bootstrap;
diff --git a/vcl/unx/generic/fontmanager/parseAFM.cxx b/vcl/unx/generic/fontmanager/parseAFM.cxx
index 3db271bab3ba..5b83021ee5d3 100644
--- a/vcl/unx/generic/fontmanager/parseAFM.cxx
+++ b/vcl/unx/generic/fontmanager/parseAFM.cxx
@@ -77,7 +77,7 @@
 #include <sys/stat.h>
 
 #include "parseAFM.hxx"
-#include "vcl/strhelper.hxx"
+#include <vcl/strhelper.hxx>
 
 #include "rtl/alloc.h"
 
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index be649906bb89..db1edd8bee37 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -23,7 +23,7 @@
 
 #include "gdiimpl.hxx"
 
-#include "vcl/salbtype.hxx"
+#include <vcl/salbtype.hxx>
 #include <vcl/gradient.hxx>
 
 #include "unx/salunx.h"
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 3d1481cde4c2..2b540663c89b 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -20,7 +20,7 @@
 #include <poll.h>
 #include "salgdiimpl.hxx"
 
-#include "vcl/salbtype.hxx"
+#include <vcl/salbtype.hxx>
 
 #include "unx/pixmap.hxx"
 #include "unx/salunx.h"
@@ -36,7 +36,7 @@
 
 #include "unx/printergfx.hxx"
 
-#include "vcl/bitmapaccess.hxx"
+#include <vcl/bitmapaccess.hxx>
 #include <outdata.hxx>
 
 void X11SalGraphics::CopyScreenArea( Display* pDisplay,
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index 2bb72059beaf..a6c7cdbf8fe0 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -22,7 +22,7 @@
 
 #include "unx/freetype_glyphcache.hxx"
 
-#include "vcl/svapp.hxx"
+#include <vcl/svapp.hxx>
 #include <fontinstance.hxx>
 #include <impfont.hxx>
 #include "fontattributes.hxx"
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index d76cdf694ec3..6852c0652024 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -28,7 +28,7 @@
 #include "unx/gendata.hxx"
 #include "headless/svpinst.hxx"
 #include "unx/desktops.hxx"
-#include "vcl/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
 #include <config_vclplug.h>
 
 #include <cstdio>
diff --git a/vcl/unx/generic/print/bitmap_gfx.cxx b/vcl/unx/generic/print/bitmap_gfx.cxx
index 47c48daa3a8b..d89d190d60eb 100644
--- a/vcl/unx/generic/print/bitmap_gfx.cxx
+++ b/vcl/unx/generic/print/bitmap_gfx.cxx
@@ -20,7 +20,7 @@
 #include "psputil.hxx"
 
 #include "unx/printergfx.hxx"
-#include "vcl/strhelper.hxx"
+#include <vcl/strhelper.hxx>
 
 namespace psp {
 
diff --git a/vcl/unx/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx
index 52387c97fc32..e8cfadafce76 100644
--- a/vcl/unx/generic/print/common_gfx.cxx
+++ b/vcl/unx/generic/print/common_gfx.cxx
@@ -27,8 +27,8 @@
 #include "unx/printergfx.hxx"
 #include "unx/printerjob.hxx"
 #include "unx/fontmanager.hxx"
-#include "vcl/strhelper.hxx"
-#include "vcl/printerinfomanager.hxx"
+#include <vcl/strhelper.hxx>
+#include <vcl/printerinfomanager.hxx>
 
 #include "tools/debug.hxx"
 #include "tools/color.hxx"
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 6af1c69faa7c..3c88aa9a9df6 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -39,16 +39,16 @@
 #include <comphelper/fileurl.hxx>
 #include "rtl/ustring.hxx"
 
-#include "vcl/button.hxx"
-#include "vcl/dialog.hxx"
-#include "vcl/edit.hxx"
-#include "vcl/fixed.hxx"
-#include "vcl/idle.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/print.hxx"
-#include "vcl/pdfwriter.hxx"
-#include "vcl/printerinfomanager.hxx"
-#include "vcl/settings.hxx"
+#include <vcl/button.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/edit.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/idle.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/print.hxx>
+#include <vcl/pdfwriter.hxx>
+#include <vcl/printerinfomanager.hxx>
+#include <vcl/settings.hxx>
 #include "svids.hrc"
 #include "saldatabasic.hxx"
 #include "unx/genprn.h"
diff --git a/vcl/unx/generic/print/printerjob.cxx b/vcl/unx/generic/print/printerjob.cxx
index 4675ef7d8e89..f740514c4013 100644
--- a/vcl/unx/generic/print/printerjob.cxx
+++ b/vcl/unx/generic/print/printerjob.cxx
@@ -28,9 +28,9 @@
 
 #include "unx/printerjob.hxx"
 #include "unx/printergfx.hxx"
-#include "vcl/ppdparser.hxx"
-#include "vcl/strhelper.hxx"
-#include "vcl/printerinfomanager.hxx"
+#include <vcl/ppdparser.hxx>
+#include <vcl/strhelper.hxx>
+#include <vcl/printerinfomanager.hxx>
 
 #include "rtl/ustring.hxx"
 #include "rtl/strbuf.hxx"
diff --git a/vcl/unx/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx
index 1d39f31420bb..3d02468658d7 100644
--- a/vcl/unx/generic/print/prtsetup.hxx
+++ b/vcl/unx/generic/print/prtsetup.hxx
@@ -22,17 +22,17 @@
 
 #include "tools/link.hxx"
 
-#include "vcl/tabdlg.hxx"
-#include "vcl/tabpage.hxx"
-#include "vcl/tabctrl.hxx"
-#include "vcl/button.hxx"
-#include "vcl/edit.hxx"
-#include "vcl/fixed.hxx"
-#include "vcl/lstbox.hxx"
-#include "vcl/field.hxx"
-#include "vcl/combobox.hxx"
-#include "vcl/ppdparser.hxx"
-#include "vcl/printerinfomanager.hxx"
+#include <vcl/tabdlg.hxx>
+#include <vcl/tabpage.hxx>
+#include <vcl/tabctrl.hxx>
+#include <vcl/button.hxx>
+#include <vcl/edit.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/lstbox.hxx>
+#include <vcl/field.hxx>
+#include <vcl/combobox.hxx>
+#include <vcl/ppdparser.hxx>
+#include <vcl/printerinfomanager.hxx>
 
 class RTSPaperPage;
 class RTSDevicePage;
diff --git a/vcl/unx/generic/print/text_gfx.cxx b/vcl/unx/generic/print/text_gfx.cxx
index 1c90fda00735..93765d2c4078 100644
--- a/vcl/unx/generic/print/text_gfx.cxx
+++ b/vcl/unx/generic/print/text_gfx.cxx
@@ -24,7 +24,7 @@
 
 #include "unx/printergfx.hxx"
 #include "unx/fontmanager.hxx"
-#include "vcl/helper.hxx"
+#include <vcl/helper.hxx>
 
 #include "osl/thread.h"
 
diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index 309309e9bbee..f52e577bf31b 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <officecfg/Office/Common.hxx>
-#include "vcl/jobdata.hxx"
-#include "vcl/printerinfomanager.hxx"
+#include <vcl/jobdata.hxx>
+#include <vcl/printerinfomanager.hxx>
 #include "tools/stream.hxx"
 
 #include <rtl/strbuf.hxx>
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 538ce8274e75..f5a20a4f1346 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -20,11 +20,11 @@
 #include <stdlib.h>
 
 #include <comphelper/string.hxx>
-#include "vcl/ppdparser.hxx"
-#include "vcl/strhelper.hxx"
-#include "vcl/helper.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/settings.hxx"
+#include <vcl/ppdparser.hxx>
+#include <vcl/strhelper.hxx>
+#include <vcl/helper.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
 
 #include "unx/cupsmgr.hxx"
 
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 152e1633eb39..a20e1d25a7d3 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -22,7 +22,7 @@
 #include <signal.h>
 
 #include "unx/cupsmgr.hxx"
-#include "vcl/strhelper.hxx"
+#include <vcl/strhelper.hxx>
 
 #include "unx/saldata.hxx"
 
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 533582fc8216..aeeae87a78d6 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -27,14 +27,14 @@
 
 #include "sal/alloca.h"
 
-#include "vcl/floatwin.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/keycodes.hxx"
-#include "vcl/layout.hxx"
-#include "vcl/printerinfomanager.hxx"
-#include "vcl/settings.hxx"
-#include "vcl/bitmapaccess.hxx"
-#include "vcl/opengl/OpenGLContext.hxx"
+#include <vcl/floatwin.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/keycodes.hxx>
+#include <vcl/layout.hxx>
+#include <vcl/printerinfomanager.hxx>
+#include <vcl/settings.hxx>
+#include <vcl/bitmapaccess.hxx>
+#include <vcl/opengl/OpenGLContext.hxx>
 
 #include <prex.h>
 #include <X11/Xatom.h>
diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index f9c25fdd6fae..86b663a16112 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/vcl/unx/gtk/a11y/atklistener.cxx
@@ -32,7 +32,7 @@
 
 #include "atklistener.hxx"
 #include "atkwrapper.hxx"
-#include "vcl/svapp.hxx"
+#include <vcl/svapp.hxx>
 
 #include <rtl/ref.hxx>
 
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index cafa3a1b585f..af677fa03ea7 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -20,7 +20,7 @@
 #include <unx/gtk/gtkframe.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
-#include "vcl/popupmenuwindow.hxx"
+#include <vcl/popupmenuwindow.hxx>
 
 #include "atkwindow.hxx"
 #include "atkwrapper.hxx"
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index c836b0c328d4..96df4b7617a1 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -34,7 +34,7 @@
 #include <vcl/svapp.hxx>
 #include <tools/urlobj.hxx>
 
-#include "vcl/window.hxx"
+#include <vcl/window.hxx>
 #include "unx/gtk/gtkframe.hxx"
 #include "gtk/fpicker/SalGtkPicker.hxx"
 
diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx
index 0718b9067175..c4695b2d0d9a 100644
--- a/vcl/unx/gtk/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx
@@ -19,7 +19,7 @@
 
 #include <config_version.h>
 
-#include "vcl/svapp.hxx"
+#include <vcl/svapp.hxx>
 
 #include "unx/gtk/gtkframe.hxx"
 #include "unx/gtk/gtkdata.hxx"
@@ -38,7 +38,7 @@
 
 #include <boost/optional.hpp>
 
-#include "vcl/vclenum.hxx"
+#include <vcl/vclenum.hxx>
 #include <vcl/settings.hxx>
 #include "unx/fontmanager.hxx"
 #include <vcl/decoview.hxx>
diff --git a/vcl/unx/gtk/salprn-gtk.cxx b/vcl/unx/gtk/salprn-gtk.cxx
index b5f2c1471709..9b7828d337f6 100644
--- a/vcl/unx/gtk/salprn-gtk.cxx
+++ b/vcl/unx/gtk/salprn-gtk.cxx
@@ -14,11 +14,11 @@
 #include "unx/gtk/gtkinst.hxx"
 #include "unx/gtk/gtkprn.hxx"
 
-#include "vcl/configsettings.hxx"
-#include "vcl/help.hxx"
-#include "vcl/print.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/window.hxx"
+#include <vcl/configsettings.hxx>
+#include <vcl/help.hxx>
+#include <vcl/print.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
 
 #include <gtk/gtk.h>
 
diff --git a/vcl/win/app/saldata.cxx b/vcl/win/app/saldata.cxx
index 94dba62444a5..4de375277a10 100644
--- a/vcl/win/app/saldata.cxx
+++ b/vcl/win/app/saldata.cxx
@@ -19,7 +19,7 @@
 
 #include <svsys.h>
 #include "rtl/tencinfo.h"
-#include "vcl/svapp.hxx"
+#include <vcl/svapp.hxx>
 
 #include "win/saldata.hxx"
 
diff --git a/vcl/win/app/salinfo.cxx b/vcl/win/app/salinfo.cxx
index 2e30910f821d..2e2e22144a02 100644
--- a/vcl/win/app/salinfo.cxx
+++ b/vcl/win/app/salinfo.cxx
@@ -22,7 +22,7 @@
 
 #include "tools/debug.hxx"
 
-#include "vcl/window.hxx"
+#include <vcl/window.hxx>
 
 #include "win/salsys.h"
 #include "win/salframe.h"
diff --git a/vcl/win/gdi/salgdi2.cxx b/vcl/win/gdi/salgdi2.cxx
index 49dedcc2b339..1500ae8af312 100644
--- a/vcl/win/gdi/salgdi2.cxx
+++ b/vcl/win/gdi/salgdi2.cxx
@@ -30,8 +30,8 @@
 #include <win/salgdi.h>
 #include <win/salframe.h>
 
-#include "vcl/salbtype.hxx"
-#include "vcl/bitmapaccess.hxx"
+#include <vcl/salbtype.hxx>
+#include <vcl/bitmapaccess.hxx>
 #include "outdata.hxx"
 #include "salgdiimpl.hxx"
 #include "opengl/win/gdiimpl.hxx"
diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx b/vcl/win/gdi/salnativewidgets-luna.cxx
index e10de37da9c4..1fa4d589f233 100644
--- a/vcl/win/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
@@ -36,7 +36,7 @@
 #include "osl/module.h"
 
 #include <opengl/win/gdiimpl.hxx>
-#include "vcl/svapp.hxx"
+#include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
 #include "win/svsys.h"