fix-includes.pl: svtools

Change-Id: I509299306ab6cd97c96e9a26d4674f983bbffbec

67 files changed, 135 insertions, 166 deletions

diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx
index 53d3240b6833..98a538d6fb5b 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -14,42 +14,6 @@
  also fixes all possible problems, so it's usually better to use it).
 */
 
-#include "com/sun/star/beans/XPropertySet.hpp"
-#include "com/sun/star/document/XDocumentProperties.hpp"
-#include "com/sun/star/script/Converter.hpp"
-#include "com/sun/star/script/XTypeConverter.hpp"
-#include "com/sun/star/task/OfficeRestartManager.hpp"
-#include "com/sun/star/task/XInteractionHandler.hpp"
-#include "com/sun/star/uno/Any.hxx"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/Type.hxx"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "comphelper/processfactory.hxx"
-#include "comphelper/string.hxx"
-#include "osl/diagnose.h"
-#include "rtl/ustring.hxx"
-#include "sal/config.h"
-#include "sal/types.h"
-#include "svl/filenotation.hxx"
-#include "svl/inettype.hxx"
-#include "svl/pickerhistoryaccess.hxx"
-#include "svl/urihelper.hxx"
-#include "svl/urlbmk.hxx"
-#include "tools/datetime.hxx"
-#include "tools/debug.hxx"
-#include "tools/link.hxx"
-#include "tools/urlobj.hxx"
-#include "unotools/configmgr.hxx"
-#include "unotools/pathoptions.hxx"
-#include "unotools/ucbhelper.hxx"
-#include "vcl/button.hxx"
-#include "vcl/dialog.hxx"
-#include "vcl/graph.hxx"
-#include "vcl/image.hxx"
-#include "vcl/settings.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/txtattr.hxx"
-#include "vcl/window.hxx"
 #include <algorithm>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/numeric/ftools.hxx>
@@ -194,6 +158,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/script/Converter.hpp>
 #include <com/sun/star/script/XTypeConverter.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/DatabaseContext.hpp>
@@ -214,6 +179,7 @@
 #include <com/sun/star/table/CellAddress.hpp>
 #include <com/sun/star/table/CellRangeAddress.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
+#include <com/sun/star/task/OfficeRestartManager.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/text/GraphicCrop.hpp>
 #include <com/sun/star/text/XPageCursor.hpp>
@@ -252,6 +218,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/Color.hpp>
 #include <com/sun/star/util/Date.hpp>
@@ -375,9 +342,12 @@
 #include <svl/itemset.hxx>
 #include <svl/macitem.hxx>
 #include <svl/numuno.hxx>
+#include <svl/pickerhistoryaccess.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/smplhint.hxx>
 #include <svl/stritem.hxx>
+#include <svl/urihelper.hxx>
+#include <svl/urlbmk.hxx>
 #include <svl/urlfilter.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
@@ -516,5 +486,4 @@
 #include <vcl/wrkwin.hxx>
 #include <vcl/xtextedt.hxx>
 #include <vector>
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/vclxaccessibleheaderbar.hxx b/svtools/inc/vclxaccessibleheaderbar.hxx
index 9fda343e9ab0..738b64e39159 100644
--- a/svtools/inc/vclxaccessibleheaderbar.hxx
+++ b/svtools/inc/vclxaccessibleheaderbar.hxx
@@ -26,7 +26,7 @@
 #include <svtools/headbar.hxx>
 #endif
 #ifndef _TOOLKIT_AWT_VCLXWINDOW_HXX_
-#include "toolkit/awt/vclxwindow.hxx"
+#include <toolkit/awt/vclxwindow.hxx>
 #endif
 class HeaderBar;
 
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 5f9407e3ce78..126af32bdb92 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -37,7 +37,7 @@
 #include <vcl/svapp.hxx>
 #include <rtl/instance.hxx>
 
-#include <itemholder2.hxx>
+#include "itemholder2.hxx"
 
 using namespace utl;
 using namespace com::sun::star::uno;
diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx
index 89f5a0e956c6..949e43874312 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -19,11 +19,11 @@
 
 
 #include <svtools/apearcfg.hxx>
-#include "com/sun/star/uno/Any.hxx"
+#include <com/sun/star/uno/Any.hxx>
 
-#include "tools/debug.hxx"
-#include "vcl/settings.hxx"
-#include "vcl/svapp.hxx"
+#include <tools/debug.hxx>
+#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
 #include <sal/macros.h>
 
 #define DEFAULT_DRAGMODE    2
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 1cad3e8d31bb..7a087c45c8b4 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -32,7 +32,7 @@
 #include <svl/smplhint.hxx>
 #include <osl/mutex.hxx>
 
-#include <itemholder2.hxx>
+#include "itemholder2.hxx"
 
  /* #100822# ----
 #include <vcl/wrkwin.hxx>
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index 2e58a6ce4fbb..6fde083bc2ec 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -33,7 +33,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 
-#include <itemholder2.hxx>
+#include "itemholder2.hxx"
 
 #include <sal/macros.h>
 
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index 3c6052186a7c..4481b5098a33 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -17,24 +17,24 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
-
-#include "com/sun/star/beans/XPropertySet.hpp"
-#include "com/sun/star/document/XDocumentProperties.hpp"
-#include "com/sun/star/script/Converter.hpp"
-#include "com/sun/star/script/XTypeConverter.hpp"
-#include "comphelper/processfactory.hxx"
-#include "comphelper/string.hxx"
-#include "rtl/ustring.hxx"
-#include "svl/inettype.hxx"
-#include "svtools/DocumentInfoPreview.hxx"
-#include "svtools/imagemgr.hxx"
-#include "vcl/txtattr.hxx"
-#include "vcl/settings.hxx"
-#include "tools/datetime.hxx"
-#include "tools/urlobj.hxx"
-#include "unotools/pathoptions.hxx"
-#include "unotools/ucbhelper.hxx"
+#include <sal/config.h>
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/document/XDocumentProperties.hpp>
+#include <com/sun/star/script/Converter.hpp>
+#include <com/sun/star/script/XTypeConverter.hpp>
+#include <comphelper/processfactory.hxx>
+#include <comphelper/string.hxx>
+#include <rtl/ustring.hxx>
+#include <svl/inettype.hxx>
+#include <svtools/DocumentInfoPreview.hxx>
+#include <svtools/imagemgr.hxx>
+#include <vcl/txtattr.hxx>
+#include <vcl/settings.hxx>
+#include <tools/datetime.hxx>
+#include <tools/urlobj.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/ucbhelper.hxx>
 
 #include "fileview.hxx"
 #include "templwin.hrc"
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 3e6d1f09870d..8b664c75647c 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -18,15 +18,15 @@
  */
 
 #include "fileview.hxx"
-#include "sal/config.h"
-#include "svtools/treelistentry.hxx"
+#include <sal/config.h>
+#include <svtools/treelistentry.hxx>
 #include <svtools/fileview.hxx>
 #include <svtools/svtresid.hxx>
 #include <svtools/imagemgr.hxx>
 #include <svtools/headbar.hxx>
 #include <svtools/svtabbx.hxx>
 #include <svtools/svtools.hrc>
-#include "svtools/viewdataentry.hxx"
+#include <svtools/viewdataentry.hxx>
 #include "fileview.hrc"
 #include "contentenumeration.hxx"
 #include <svtools/AccessibleBrowseBoxObjType.hxx>
diff --git a/svtools/source/contnr/fileview.hxx b/svtools/source/contnr/fileview.hxx
index 9a2fb34ace80..c1dad51e3da4 100644
--- a/svtools/source/contnr/fileview.hxx
+++ b/svtools/source/contnr/fileview.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_SVTOOLS_SOURCE_CONTNR_FILEVIEW_HXX
 #define INCLUDED_SVTOOLS_SOURCE_CONTNR_FILEVIEW_HXX
 
-#include "sal/config.h"
+#include <sal/config.h>
 
-#include "sal/types.h"
+#include <sal/types.h>
 #include <rtl/ustring.hxx>
 
 OUString CreateExactSizeText(sal_Int64 nSize);
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 3ce62da31299..32c694a12d59 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -35,8 +35,8 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 
-#include "svtools/treelistentry.hxx"
-#include "svtools/viewdataentry.hxx"
+#include <svtools/treelistentry.hxx>
+#include <svtools/viewdataentry.hxx>
 
 #define NODE_BMP_TABDIST_NOTVALID   -2000000
 #define FIRST_ENTRY_TAB             1
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index f624e75b9181..62a34a90328d 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -19,8 +19,8 @@
 
 #include <svtools/treelistbox.hxx>
 #include <svtools/svlbitm.hxx>
-#include "svtools/treelistentry.hxx"
-#include "svtools/viewdataentry.hxx"
+#include <svtools/treelistentry.hxx>
+#include <svtools/viewdataentry.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/button.hxx>
 #include <vcl/decoview.hxx>
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 030394b02314..c800c6c4db04 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -39,7 +39,7 @@
 #include <svtools/helpid.hrc>
 #include <unotools/viewoptions.hxx>
 #include <unotools/ucbhelper.hxx>
-#include "unotools/configmgr.hxx"
+#include <unotools/configmgr.hxx>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/Frame.hpp>
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index c117a6822f34..0d92afd58fe7 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svtools/treelist.hxx"
-#include "svtools/treelistentry.hxx"
-#include "svtools/viewdataentry.hxx"
-#include "osl/diagnose.h"
+#include <svtools/treelist.hxx>
+#include <svtools/treelistentry.hxx>
+#include <svtools/viewdataentry.hxx>
+#include <osl/diagnose.h>
 
 #include <stdio.h>
 
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 17da0b73c2f4..89c1ca2980dc 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -37,8 +37,8 @@
 
 #include <svtools/svmedit.hxx>
 #include <svtools/svlbitm.hxx>
-#include "svtools/treelistentry.hxx"
-#include "svtools/viewdataentry.hxx"
+#include <svtools/treelistentry.hxx>
+#include <svtools/viewdataentry.hxx>
 #include "svimpbox.hxx"
 
 #include <set>
diff --git a/svtools/source/contnr/treelistentry.cxx b/svtools/source/contnr/treelistentry.cxx
index 378a64689f4f..26d7dcd20112 100644
--- a/svtools/source/contnr/treelistentry.cxx
+++ b/svtools/source/contnr/treelistentry.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svtools/treelistentry.hxx"
-#include "svtools/treelist.hxx"
+#include <svtools/treelistentry.hxx>
+#include <svtools/treelist.hxx>
 
 #include <limits>
 
diff --git a/svtools/source/contnr/viewdataentry.cxx b/svtools/source/contnr/viewdataentry.cxx
index 93ea793fb7a2..3aeab97fe8c9 100644
--- a/svtools/source/contnr/viewdataentry.cxx
+++ b/svtools/source/contnr/viewdataentry.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svtools/viewdataentry.hxx"
+#include <svtools/viewdataentry.hxx>
 
-#include "tools/debug.hxx"
+#include <tools/debug.hxx>
 
 
 SvViewDataEntry::SvViewDataEntry() :
diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx
index 49d3a26165da..bfbdec66e443 100644
--- a/svtools/source/control/accessibleruler.cxx
+++ b/svtools/source/control/accessibleruler.cxx
@@ -34,7 +34,7 @@
 #include <tools/debug.hxx>
 #include <tools/gen.hxx>
 
-#include "svtools/ruler.hxx"
+#include <svtools/ruler.hxx>
 
 using namespace ::cppu;
 using namespace ::osl;
diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx
index c7e6dd5447d3..13f96f01a3ff 100644
--- a/svtools/source/control/fileurlbox.cxx
+++ b/svtools/source/control/fileurlbox.cxx
@@ -19,7 +19,7 @@
 
 #include <svtools/fileurlbox.hxx>
 #include <osl/file.h>
-#include "svl/filenotation.hxx"
+#include <svl/filenotation.hxx>
 
 
 namespace svt
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 809029bd51ae..ff00562e5734 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -50,7 +50,7 @@
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
 #include <svl/itemset.hxx>
-#include "svl/urihelper.hxx"
+#include <svl/urihelper.hxx>
 #include <unotools/pathoptions.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include <ucbhelper/content.hxx>
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index cd1bc2857ce9..d0f1e49ce9a0 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -28,8 +28,8 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/settings.hxx>
 
-#include "svtools/valueset.hxx"
-#include "svtools/toolbarmenu.hxx"
+#include <svtools/valueset.hxx>
+#include <svtools/toolbarmenu.hxx>
 #include "toolbarmenuimp.hxx"
 
 using namespace ::com::sun::star::uno;
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index 4763fe5131ff..a8bae45688eb 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -27,7 +27,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-#include "svtools/toolbarmenu.hxx"
+#include <svtools/toolbarmenu.hxx>
 
 #include "toolbarmenuimp.hxx"
 
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 6c33b4f32760..16b4520be836 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -47,7 +47,7 @@
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <svtools/localresaccess.hxx>
-#include "svl/filenotation.hxx"
+#include <svl/filenotation.hxx>
 #include <tools/urlobj.hxx>
 #include <algorithm>
 #include <map>
diff --git a/svtools/source/dialogs/mcvmath.cxx b/svtools/source/dialogs/mcvmath.cxx
index 5a3548665dec..fda422773a88 100644
--- a/svtools/source/dialogs/mcvmath.cxx
+++ b/svtools/source/dialogs/mcvmath.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <mcvmath.hxx>
+#include "mcvmath.hxx"
 
 
 // die folgenden Tabellen enthalten     sin(phi) * 2**14
diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx
index 8924c74386d5..fefdf3f5ab3d 100644
--- a/svtools/source/dialogs/restartdialog.cxx
+++ b/svtools/source/dialogs/restartdialog.cxx
@@ -7,19 +7,19 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <cassert>
 
-#include "com/sun/star/task/OfficeRestartManager.hpp"
-#include "com/sun/star/task/XInteractionHandler.hpp"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "svtools/restartdialog.hxx"
-#include "tools/link.hxx"
-#include "vcl/button.hxx"
-#include "vcl/dialog.hxx"
-#include "vcl/window.hxx"
+#include <com/sun/star/task/OfficeRestartManager.hpp>
+#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <svtools/restartdialog.hxx>
+#include <tools/link.hxx>
+#include <vcl/button.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/window.hxx>
 
 namespace {
 
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index 9bad92e5ecd1..ed42faf3f278 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -31,8 +31,8 @@
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/graphic/GraphicType.hpp>
 
-#include "vcl/graph.hxx"
-#include "vcl/svapp.hxx"
+#include <vcl/graph.hxx>
+#include <vcl/svapp.hxx>
 
 #define UNOGRAPHIC_GRAPHICTYPE  1
 #define UNOGRAPHIC_MIMETYPE     2
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index a405ea709603..fbf33defd459 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <algorithm>
 
diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx
index 812601a13dff..4f68835d38bb 100644
--- a/svtools/source/hatchwindow/ipwin.cxx
+++ b/svtools/source/hatchwindow/ipwin.cxx
@@ -22,7 +22,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-#include <ipwin.hxx>
+#include "ipwin.hxx"
 #include <hatchwindow.hxx>
 
 /************************************************************************/
diff --git a/svtools/source/java/javacontext.cxx b/svtools/source/java/javacontext.cxx
index 0e3c388c23fb..f5be4776dcae 100644
--- a/svtools/source/java/javacontext.cxx
+++ b/svtools/source/java/javacontext.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "com/sun/star/uno/Any.hxx"
-#include "com/sun/star/uno/Type.hxx"
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Type.hxx>
 #include <svtools/svtresid.hxx>
 #include <svtools/javacontext.hxx>
 #include <svtools/javainteractionhandler.hxx>
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index a6715e3b5bf1..9c1c51db66c9 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -47,7 +47,7 @@
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/chart2/XDefaultSizeTransmitter.hpp>
 #include <cppuhelper/implbase4.hxx>
-#include "vcl/svapp.hxx"
+#include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 
 using namespace com::sun::star;
diff --git a/svtools/source/misc/filechangedchecker.cxx b/svtools/source/misc/filechangedchecker.cxx
index 39c6c0eb9350..9d8a7133bec4 100644
--- a/svtools/source/misc/filechangedchecker.cxx
+++ b/svtools/source/misc/filechangedchecker.cxx
@@ -7,9 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
-#include "svtools/filechangedchecker.hxx"
+#include <svtools/filechangedchecker.hxx>
 
 FileChangedChecker::FileChangedChecker(const OUString& rFilename, const ::boost::function0<void>& rCallback) :
     mTimer(),
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 06c78f557962..1f6df45a20dd 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -22,8 +22,8 @@
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
-#include "vcl/image.hxx"
-#include "vcl/settings.hxx"
+#include <vcl/image.hxx>
+#include <vcl/settings.hxx>
 #include <sot/storage.hxx>
 #include <comphelper/classids.hxx>
 #include <unotools/ucbhelper.hxx>
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 6fce7f7952ae..df2fddcfc1a8 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -23,7 +23,7 @@
 #include <vcl/mapmod.hxx>
 #include <vcl/window.hxx>
 
-#include "svl/urihelper.hxx"
+#include <svl/urihelper.hxx>
 #include <svtools/imap.hxx>
 #include <svtools/imapobj.hxx>
 #include <svtools/imapcirc.hxx>
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index d7f742244300..14e67b100f3a 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -26,7 +26,7 @@
 #include <vcl/wrkwin.hxx>
 #include <sot/formats.hxx>
 
-#include "svl/urihelper.hxx"
+#include <svl/urihelper.hxx>
 #include <svtools/imap.hxx>
 #include <svtools/imapobj.hxx>
 #include <svtools/imaprect.hxx>
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 3963692df658..0fc2527afaf1 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -34,7 +34,7 @@
 #include <tools/debug.hxx>
 #include <unotools/pathoptions.hxx>
 
-#include "comphelper/processfactory.hxx"
+#include <comphelper/processfactory.hxx>
 
 #include <vector>
 #include <list>
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index d9b358622db2..c210cc78efa2 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -48,7 +48,7 @@
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 
-#include "svl/urlbmk.hxx"
+#include <svl/urlbmk.hxx>
 #include <svtools/inetimg.hxx>
 #include <vcl/wmf.hxx>
 #include <svtools/imap.hxx>
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index 14d04e6ae204..541571fdea97 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -28,7 +28,7 @@
 #include <vcl/window.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
-#include "svl/urlbmk.hxx"
+#include <svl/urlbmk.hxx>
 #include <svtools/inetimg.hxx>
 #include <svtools/imap.hxx>
 #include <svtools/transfer.hxx>
diff --git a/svtools/source/misc/xwindowitem.cxx b/svtools/source/misc/xwindowitem.cxx
index f25c28dda359..c7e3ae1f0dfa 100644
--- a/svtools/source/misc/xwindowitem.cxx
+++ b/svtools/source/misc/xwindowitem.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svtools/xwindowitem.hxx"
+#include <svtools/xwindowitem.hxx>
 
 #include <vcl/window.hxx>
 
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index 72d61c6cab8d..da58dc31012c 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -30,7 +30,7 @@
 #include <svtools/imaprect.hxx>
 #include <svtools/imapcirc.hxx>
 #include <svtools/imappoly.hxx>
-#include "svl/urihelper.hxx"
+#include <svl/urihelper.hxx>
 
 #include <sstream>
 
diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx
index 776830457f06..3a106bd52f31 100644
--- a/svtools/source/table/gridtablerenderer.cxx
+++ b/svtools/source/table/gridtablerenderer.cxx
@@ -20,7 +20,7 @@
 
 #include "cellvalueconversion.hxx"
 #include "table/gridtablerenderer.hxx"
-#include "svtools/colorcfg.hxx"
+#include <svtools/colorcfg.hxx>
 
 #include <com/sun/star/graphic/XGraphic.hpp>
 
diff --git a/svtools/source/table/mousefunction.hxx b/svtools/source/table/mousefunction.hxx
index c8d801d6eab1..71f7aa032cc2 100644
--- a/svtools/source/table/mousefunction.hxx
+++ b/svtools/source/table/mousefunction.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVTOOLS_SOURCE_TABLE_MOUSEFUNCTION_HXX
 #define INCLUDED_SVTOOLS_SOURCE_TABLE_MOUSEFUNCTION_HXX
 
-#include "svtools/table/tabletypes.hxx"
+#include <svtools/table/tabletypes.hxx>
 
 #include <rtl/ref.hxx>
 
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 9921ebb22ac7..344a2f2eb999 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -20,7 +20,7 @@
 
 #include "table/tablecontrol.hxx"
 #include "table/defaultinputhandler.hxx"
-#include "svtools/table/tablemodel.hxx"
+#include <svtools/table/tablemodel.hxx>
 
 #include "tabledatawindow.hxx"
 #include "tablecontrol_impl.hxx"
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index 1da021f5e9b1..db3ff9f3f5d1 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVTOOLS_SOURCE_TABLE_TABLECONTROL_IMPL_HXX
 #define INCLUDED_SVTOOLS_SOURCE_TABLE_TABLECONTROL_IMPL_HXX
 
-#include "svtools/table/tablemodel.hxx"
+#include <svtools/table/tablemodel.hxx>
 #include "table/tablecontrolinterface.hxx"
 
 #include "svtaccessiblefactory.hxx"
diff --git a/svtools/source/table/tablegeometry.hxx b/svtools/source/table/tablegeometry.hxx
index 2fcfecf5412e..78d1079beb97 100644
--- a/svtools/source/table/tablegeometry.hxx
+++ b/svtools/source/table/tablegeometry.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVTOOLS_SOURCE_TABLE_TABLEGEOMETRY_HXX
 #define INCLUDED_SVTOOLS_SOURCE_TABLE_TABLEGEOMETRY_HXX
 
-#include "svtools/table/tabletypes.hxx"
+#include <svtools/table/tabletypes.hxx>
 
 #include <tools/gen.hxx>
 
diff --git a/svtools/source/toolpanel/drawerlayouter.cxx b/svtools/source/toolpanel/drawerlayouter.cxx
index 73e6fca2045d..565d8588ec27 100644
--- a/svtools/source/toolpanel/drawerlayouter.cxx
+++ b/svtools/source/toolpanel/drawerlayouter.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svtools/toolpanel/drawerlayouter.hxx"
+#include <svtools/toolpanel/drawerlayouter.hxx>
 #include "toolpaneldrawer.hxx"
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
diff --git a/svtools/source/toolpanel/dummypanel.hxx b/svtools/source/toolpanel/dummypanel.hxx
index c376b71a5533..0632786e911c 100644
--- a/svtools/source/toolpanel/dummypanel.hxx
+++ b/svtools/source/toolpanel/dummypanel.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_SVTOOLS_SOURCE_TOOLPANEL_DUMMYPANEL_HXX
 #define INCLUDED_SVTOOLS_SOURCE_TOOLPANEL_DUMMYPANEL_HXX
 
-#include "svtools/toolpanel/toolpanel.hxx"
-#include "svtools/toolpanel/refbase.hxx"
+#include <svtools/toolpanel/toolpanel.hxx>
+#include <svtools/toolpanel/refbase.hxx>
 
 
 namespace svt
diff --git a/svtools/source/toolpanel/paneldecklisteners.cxx b/svtools/source/toolpanel/paneldecklisteners.cxx
index f7f2070fdf17..d2560d9d2284 100644
--- a/svtools/source/toolpanel/paneldecklisteners.cxx
+++ b/svtools/source/toolpanel/paneldecklisteners.cxx
@@ -19,7 +19,7 @@
 
 
 #include "paneldecklisteners.hxx"
-#include "svtools/toolpanel/toolpaneldeck.hxx"
+#include <svtools/toolpanel/toolpaneldeck.hxx>
 
 
 namespace svt
diff --git a/svtools/source/toolpanel/paneldecklisteners.hxx b/svtools/source/toolpanel/paneldecklisteners.hxx
index 79e29c561444..c7d2c3d074b1 100644
--- a/svtools/source/toolpanel/paneldecklisteners.hxx
+++ b/svtools/source/toolpanel/paneldecklisteners.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVTOOLS_SOURCE_TOOLPANEL_PANELDECKLISTENERS_HXX
 #define INCLUDED_SVTOOLS_SOURCE_TOOLPANEL_PANELDECKLISTENERS_HXX
 
-#include "svtools/toolpanel/toolpaneldeck.hxx"
+#include <svtools/toolpanel/toolpaneldeck.hxx>
 
 #include <boost/optional.hpp>
 #include <vector>
diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx
index 3e77743fd65a..f5e449ec08bd 100644
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -18,10 +18,10 @@
  */
 
 
-#include "svtools/toolpanel/paneltabbar.hxx"
-#include "svtools/toolpanel/toolpaneldeck.hxx"
-#include "svtools/svtresid.hxx"
-#include "svtools/svtools.hrc"
+#include <svtools/toolpanel/paneltabbar.hxx>
+#include <svtools/toolpanel/toolpaneldeck.hxx>
+#include <svtools/svtresid.hxx>
+#include <svtools/svtools.hrc>
 
 #include "tabitemdescriptor.hxx"
 #include "paneltabbarpeer.hxx"
diff --git a/svtools/source/toolpanel/paneltabbarpeer.cxx b/svtools/source/toolpanel/paneltabbarpeer.cxx
index 443a1f2ae617..3ca23007ba02 100644
--- a/svtools/source/toolpanel/paneltabbarpeer.cxx
+++ b/svtools/source/toolpanel/paneltabbarpeer.cxx
@@ -19,7 +19,7 @@
 
 
 #include "paneltabbarpeer.hxx"
-#include "svtools/toolpanel/paneltabbar.hxx"
+#include <svtools/toolpanel/paneltabbar.hxx>
 
 #include <com/sun/star/lang/DisposedException.hpp>
 
diff --git a/svtools/source/toolpanel/refbase.cxx b/svtools/source/toolpanel/refbase.cxx
index 58157460304f..4ff9969330c6 100644
--- a/svtools/source/toolpanel/refbase.cxx
+++ b/svtools/source/toolpanel/refbase.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svtools/toolpanel/refbase.hxx"
+#include <svtools/toolpanel/refbase.hxx>
 
 
 namespace svt
diff --git a/svtools/source/toolpanel/tabbargeometry.hxx b/svtools/source/toolpanel/tabbargeometry.hxx
index 8e3c0c448b5b..ff535759af7a 100644
--- a/svtools/source/toolpanel/tabbargeometry.hxx
+++ b/svtools/source/toolpanel/tabbargeometry.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVTOOLS_SOURCE_TOOLPANEL_TABBARGEOMETRY_HXX
 #define INCLUDED_SVTOOLS_SOURCE_TOOLPANEL_TABBARGEOMETRY_HXX
 
-#include "svtools/toolpanel/tabalignment.hxx"
+#include <svtools/toolpanel/tabalignment.hxx>
 
 #include "tabitemdescriptor.hxx"
 
diff --git a/svtools/source/toolpanel/tabitemdescriptor.hxx b/svtools/source/toolpanel/tabitemdescriptor.hxx
index 927fd6b285c2..614d2eb75b1a 100644
--- a/svtools/source/toolpanel/tabitemdescriptor.hxx
+++ b/svtools/source/toolpanel/tabitemdescriptor.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_SVTOOLS_SOURCE_TOOLPANEL_TABITEMDESCRIPTOR_HXX
 #define INCLUDED_SVTOOLS_SOURCE_TOOLPANEL_TABITEMDESCRIPTOR_HXX
 
-#include "svtools/toolpanel/toolpanel.hxx"
-#include "svtools/toolpanel/tabitemcontent.hxx"
+#include <svtools/toolpanel/toolpanel.hxx>
+#include <svtools/toolpanel/tabitemcontent.hxx>
 
 #include <tools/gen.hxx>
 #include <osl/diagnose.h>
diff --git a/svtools/source/toolpanel/tablayouter.cxx b/svtools/source/toolpanel/tablayouter.cxx
index 3af09ebf9c1b..518b088e96f5 100644
--- a/svtools/source/toolpanel/tablayouter.cxx
+++ b/svtools/source/toolpanel/tablayouter.cxx
@@ -18,9 +18,9 @@
  */
 
 
-#include "svtools/toolpanel/tablayouter.hxx"
-#include "svtools/toolpanel/toolpaneldeck.hxx"
-#include "svtools/toolpanel/paneltabbar.hxx"
+#include <svtools/toolpanel/tablayouter.hxx>
+#include <svtools/toolpanel/toolpaneldeck.hxx>
+#include <svtools/toolpanel/paneltabbar.hxx>
 #include "svtaccessiblefactory.hxx"
 
 #include <tools/gen.hxx>
diff --git a/svtools/source/toolpanel/toolpanel.cxx b/svtools/source/toolpanel/toolpanel.cxx
index 0d1efe72640c..b0e65c8e9161 100644
--- a/svtools/source/toolpanel/toolpanel.cxx
+++ b/svtools/source/toolpanel/toolpanel.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svtools/toolpanel/toolpanel.hxx"
+#include <svtools/toolpanel/toolpanel.hxx>
 
 
 namespace svt
diff --git a/svtools/source/toolpanel/toolpanelcollection.hxx b/svtools/source/toolpanel/toolpanelcollection.hxx
index c88db479cf0b..88feb379ce59 100644
--- a/svtools/source/toolpanel/toolpanelcollection.hxx
+++ b/svtools/source/toolpanel/toolpanelcollection.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVTOOLS_SOURCE_TOOLPANEL_TOOLPANELCOLLECTION_HXX
 #define INCLUDED_SVTOOLS_SOURCE_TOOLPANEL_TOOLPANELCOLLECTION_HXX
 
-#include "svtools/toolpanel/toolpaneldeck.hxx"
+#include <svtools/toolpanel/toolpaneldeck.hxx>
 
 #include <memory>
 
diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx
index aec67db62e61..1cce8c97e1ad 100644
--- a/svtools/source/toolpanel/toolpaneldeck.cxx
+++ b/svtools/source/toolpanel/toolpaneldeck.cxx
@@ -22,9 +22,9 @@
 #include "toolpanelcollection.hxx"
 #include "paneldecklisteners.hxx"
 #include "toolpaneldeckpeer.hxx"
-#include "svtools/toolpanel/toolpaneldeck.hxx"
-#include "svtools/toolpanel/tablayouter.hxx"
-#include "svtools/toolpanel/drawerlayouter.hxx"
+#include <svtools/toolpanel/toolpaneldeck.hxx>
+#include <svtools/toolpanel/tablayouter.hxx>
+#include <svtools/toolpanel/drawerlayouter.hxx>
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.cxx b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
index 7d2f43f4c958..4979872af744 100644
--- a/svtools/source/toolpanel/toolpaneldeckpeer.cxx
+++ b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
@@ -19,7 +19,7 @@
 
 
 #include "toolpaneldeckpeer.hxx"
-#include "svtools/toolpanel/toolpaneldeck.hxx"
+#include <svtools/toolpanel/toolpaneldeck.hxx>
 
 #include <com/sun/star/lang/DisposedException.hpp>
 
diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx
index def461fefb9a..df3382bb2be8 100644
--- a/svtools/source/toolpanel/toolpaneldrawer.cxx
+++ b/svtools/source/toolpanel/toolpaneldrawer.cxx
@@ -20,8 +20,8 @@
 
 #include "toolpaneldrawer.hxx"
 #include "toolpaneldrawerpeer.hxx"
-#include "svtools/svtresid.hxx"
-#include "svtools/svtools.hrc"
+#include <svtools/svtresid.hxx>
+#include <svtools/svtools.hrc>
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 
diff --git a/svtools/source/uno/fpicker.cxx b/svtools/source/uno/fpicker.cxx
index 3550893843e0..3dd1d8de0510 100644
--- a/svtools/source/uno/fpicker.cxx
+++ b/svtools/source/uno/fpicker.cxx
@@ -17,17 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/types.h"
-#include "rtl/ustring.hxx"
+#include <sal/types.h>
+#include <rtl/ustring.hxx>
 
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 
-#include "svtools/miscopt.hxx"
-#include "svl/pickerhistoryaccess.hxx"
+#include <svtools/miscopt.hxx>
+#include <svl/pickerhistoryaccess.hxx>
 
-#include "vcl/svapp.hxx"
+#include <vcl/svapp.hxx>
 
-#include <fpicker.hxx>
+#include "fpicker.hxx"
 
 using css::uno::Reference;
 using css::uno::Sequence;
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index 1b149dca502d..9d7020939629 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svtools/genericunodialog.hxx"
+#include <svtools/genericunodialog.hxx>
 
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx
index 7256b330a18e..f3596782ae17 100644
--- a/svtools/source/uno/popupmenucontrollerbase.cxx
+++ b/svtools/source/uno/popupmenucontrollerbase.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svtools/popupmenucontrollerbase.hxx"
+#include <svtools/popupmenucontrollerbase.hxx>
 
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx
index fd1986a1dfe2..9ecd48e31cfc 100644
--- a/svtools/source/uno/popupwindowcontroller.cxx
+++ b/svtools/source/uno/popupwindowcontroller.cxx
@@ -23,8 +23,8 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/svapp.hxx>
 
-#include "svtools/popupwindowcontroller.hxx"
-#include "svtools/toolbarmenu.hxx"
+#include <svtools/popupwindowcontroller.hxx>
+#include <svtools/toolbarmenu.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx
index 61d4c4361f70..5b9f585d6bfd 100644
--- a/svtools/source/uno/svtxgridcontrol.hxx
+++ b/svtools/source/uno/svtxgridcontrol.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVTOOLS_SOURCE_UNO_SVTXGRIDCONTROL_HXX
 #define INCLUDED_SVTOOLS_SOURCE_UNO_SVTXGRIDCONTROL_HXX
 
-#include <unocontroltablemodel.hxx>
+#include "unocontroltablemodel.hxx"
 #include <table/tablecontrol.hxx>
 #include <com/sun/star/awt/grid/XGridControl.hpp>
 #include <com/sun/star/awt/grid/XGridRowSelection.hpp>
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index e49d0da9235c..1dc40e8092a0 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -26,15 +26,15 @@
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include <com/sun/star/awt/tree/XMutableTreeNode.hpp>
-#include <treecontrolpeer.hxx>
+#include "treecontrolpeer.hxx"
 #include <comphelper/processfactory.hxx>
 
 #include <rtl/ref.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/treelistbox.hxx>
-#include "svtools/treelistentry.hxx"
-#include "svtools/viewdataentry.hxx"
+#include <svtools/treelistentry.hxx>
+#include <svtools/viewdataentry.hxx>
 #include <svtools/svlbitm.hxx>
 
 #include <map>
diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx
index acf2fbfbc639..db711d3eb62c 100644
--- a/svtools/source/uno/unocontroltablemodel.hxx
+++ b/svtools/source/uno/unocontroltablemodel.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVTOOLS_SOURCE_UNO_UNOCONTROLTABLEMODEL_HXX
 #define INCLUDED_SVTOOLS_SOURCE_UNO_UNOCONTROLTABLEMODEL_HXX
 
-#include "svtools/table/tablemodel.hxx"
+#include <svtools/table/tablemodel.hxx>
 #include "table/tablecontrol.hxx"
 
 #include <com/sun/star/awt/grid/XGridControl.hpp>
diff --git a/svtools/source/uno/unogridcolumnfacade.hxx b/svtools/source/uno/unogridcolumnfacade.hxx
index f66af43929cb..2332611f9217 100644
--- a/svtools/source/uno/unogridcolumnfacade.hxx
+++ b/svtools/source/uno/unogridcolumnfacade.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVTOOLS_SOURCE_UNO_UNOGRIDCOLUMNFACADE_HXX
 #define INCLUDED_SVTOOLS_SOURCE_UNO_UNOGRIDCOLUMNFACADE_HXX
 
-#include "svtools/table/tablemodel.hxx"
+#include <svtools/table/tablemodel.hxx>
 #include "table/tablecontrol.hxx"
 
 #include <com/sun/star/awt/grid/XGridColumn.hpp>
diff --git a/svtools/source/uno/wizard/wizardpagecontroller.hxx b/svtools/source/uno/wizard/wizardpagecontroller.hxx
index 9e2f4c11c340..c26d5925cd68 100644
--- a/svtools/source/uno/wizard/wizardpagecontroller.hxx
+++ b/svtools/source/uno/wizard/wizardpagecontroller.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVTOOLS_SOURCE_UNO_WIZARD_WIZARDPAGECONTROLLER_HXX
 #define INCLUDED_SVTOOLS_SOURCE_UNO_WIZARD_WIZARDPAGECONTROLLER_HXX
 
-#include "svtools/wizardmachine.hxx"
+#include <svtools/wizardmachine.hxx>
 
 #include <com/sun/star/ui/dialogs/XWizardController.hpp>