sw: clean up inter-module includes

Change-Id: I812842e76ae0b7bc252530d2b4aaa2b452c2babf

80 files changed, 118 insertions, 120 deletions

diff --git a/sw/inc/IDocumentChartDataProviderAccess.hxx b/sw/inc/IDocumentChartDataProviderAccess.hxx
index 8a53ae447b7d..0815cd5860fd 100644
--- a/sw/inc/IDocumentChartDataProviderAccess.hxx
+++ b/sw/inc/IDocumentChartDataProviderAccess.hxx
@@ -20,7 +20,7 @@
  #ifndef INCLUDED_SW_INC_IDOCUMENTCHARTDATAPROVIDERACCESS_HXX
  #define INCLUDED_SW_INC_IDOCUMENTCHARTDATAPROVIDERACCESS_HXX
 
-#include "com/sun/star/uno/Reference.hxx"
+#include <com/sun/star/uno/Reference.hxx>
 
 namespace com { namespace sun { namespace star { namespace frame {
     class XModel;
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 4c1495bd7e12..19929d2c829f 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -63,7 +63,7 @@ class SwList;
 #include <sfx2/objsh.hxx>
 #include <svl/style.hxx>
 #include <editeng/numitem.hxx>
-#include "comphelper/implementationreference.hxx"
+#include <comphelper/implementationreference.hxx>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
 #include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index f81e6d0589b4..b8039fa3e48b 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -29,7 +29,7 @@
 #include <flyenum.hxx>
 
 #include <svx/svdtypes.hxx>
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 #include <svtools/embedhlp.hxx>
 
 #include <vector>
diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx
index 55751e61dc67..448bb9e854c9 100644
--- a/sw/inc/flddropdown.hxx
+++ b/sw/inc/flddropdown.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_FLDDROPDOWN_HXX
 #define INCLUDED_SW_INC_FLDDROPDOWN_HXX
 
-#include "com/sun/star/uno/Sequence.hxx"
+#include <com/sun/star/uno/Sequence.hxx>
 #include "swdllapi.h"
 #include "fldbas.hxx"
 
diff --git a/sw/inc/init.hxx b/sw/inc/init.hxx
index f7feedaa1337..78932dcb5130 100644
--- a/sw/inc/init.hxx
+++ b/sw/inc/init.hxx
@@ -19,11 +19,11 @@
 #ifndef INCLUDED_SW_INC_INIT_HXX
 #define INCLUDED_SW_INC_INIT_HXX
 
-#include "sal/config.h"
+#include <sal/config.h>
 
-#include "boost/noncopyable.hpp"
-#include "osl/module.h"
-#include "osl/module.hxx"
+#include <boost/noncopyable.hpp>
+#include <osl/module.h>
+#include <osl/module.hxx>
 
 class SwViewShell;
 
diff --git a/sw/inc/swddllapi.h b/sw/inc/swddllapi.h
index d0d70c9d75b5..c920285275e3 100644
--- a/sw/inc/swddllapi.h
+++ b/sw/inc/swddllapi.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_INC_SWDDLLAPI_H
 #define INCLUDED_SW_INC_SWDDLLAPI_H
 
-#include "sal/types.h"
+#include <sal/types.h>
 
 #if defined(SWD_DLLIMPLEMENTATION)
 #define SWD_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
diff --git a/sw/inc/swdllapi.h b/sw/inc/swdllapi.h
index 91108f7e45a0..ceca351ee298 100644
--- a/sw/inc/swdllapi.h
+++ b/sw/inc/swdllapi.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_INC_SWDLLAPI_H
 #define INCLUDED_SW_INC_SWDLLAPI_H
 
-#include "sal/types.h"
+#include <sal/types.h>
 
 #if defined(SW_DLLIMPLEMENTATION)
 #define SW_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
diff --git a/sw/source/core/access/textmarkuphelper.hxx b/sw/source/core/access/textmarkuphelper.hxx
index ba555825cda8..1d15b230945b 100644
--- a/sw/source/core/access/textmarkuphelper.hxx
+++ b/sw/source/core/access/textmarkuphelper.hxx
@@ -20,10 +20,10 @@
 #define INCLUDED_SW_SOURCE_CORE_ACCESS_TEXTMARKUPHELPER_HXX
 
 #include <sal/types.h>
-#include "com/sun/star/lang/IndexOutOfBoundsException.hpp"
-#include "com/sun/star/lang/IllegalArgumentException.hpp"
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "com/sun/star/uno/Sequence.h"
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.h>
 
 namespace com { namespace sun { namespace star { namespace accessibility {
 struct TextSegment;
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 0d0172cedd3a..bb3063f22ccc 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -21,7 +21,7 @@
 #include <svx/svdmodel.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/paperinf.hxx>
-#include "editeng/frmdiritem.hxx"
+#include <editeng/frmdiritem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/printer.hxx>
diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx
index dc37ec1b4f02..a947f4e900f1 100644
--- a/sw/source/core/docnode/cancellablejob.hxx
+++ b/sw/source/core/docnode/cancellablejob.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_DOCNODE_CANCELLABLEJOB_HXX
 #define INCLUDED_SW_SOURCE_CORE_DOCNODE_CANCELLABLEJOB_HXX
 
-#include "sal/config.h"
-#include "cppuhelper/implbase1.hxx"
-#include "com/sun/star/util/XCancellable.hpp"
+#include <sal/config.h>
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/util/XCancellable.hpp>
 
 #include <rtl/ref.hxx>
 
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 867381c30c25..c7eb9517a322 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -25,8 +25,8 @@
 #include <set>
 #include <swtypes.hxx>
 #include <itabenum.hxx>
-#include "boost/noncopyable.hpp"
-#include "boost/scoped_ptr.hpp"
+#include <boost/noncopyable.hpp>
+#include <boost/scoped_ptr.hpp>
 
 class SfxItemSet;
 
diff --git a/sw/source/core/inc/finalthreadmanager.hxx b/sw/source/core/inc/finalthreadmanager.hxx
index e44c952b5955..17e4c761012b 100644
--- a/sw/source/core/inc/finalthreadmanager.hxx
+++ b/sw/source/core/inc/finalthreadmanager.hxx
@@ -20,13 +20,13 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_FINALTHREADMANAGER_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_FINALTHREADMANAGER_HXX
 
-#include "sal/config.h"
-#include "cppuhelper/factory.hxx"
-#include "cppuhelper/implementationentry.hxx"
-#include "cppuhelper/implbase3.hxx"
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/util/XJobManager.hpp"
-#include "com/sun/star/frame/XTerminateListener2.hpp"
+#include <sal/config.h>
+#include <cppuhelper/factory.hxx>
+#include <cppuhelper/implementationentry.hxx>
+#include <cppuhelper/implbase3.hxx>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/util/XJobManager.hpp>
+#include <com/sun/star/frame/XTerminateListener2.hpp>
 #include <osl/mutex.hxx>
 #include <list>
 
diff --git a/sw/source/core/inc/swthreadjoiner.hxx b/sw/source/core/inc/swthreadjoiner.hxx
index 2d33dfeb4555..fa71445a5c55 100644
--- a/sw/source/core/inc/swthreadjoiner.hxx
+++ b/sw/source/core/inc/swthreadjoiner.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_SWTHREADJOINER_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_SWTHREADJOINER_HXX
 
-#include "com/sun/star/util/XJobManager.hpp"
+#include <com/sun/star/util/XJobManager.hpp>
 
 /** Testing */
 class SwThreadJoiner
diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx
index ca5646b11c00..c78cb78d2692 100644
--- a/sw/source/core/inc/threadmanager.hxx
+++ b/sw/source/core/inc/threadmanager.hxx
@@ -28,7 +28,7 @@
 #include <deque>
 #include <list>
 #include <cppuhelper/weak.hxx>
-#include "com/sun/star/util/XJobManager.hpp"
+#include <com/sun/star/util/XJobManager.hpp>
 #include <observablethread.hxx>
 #include <cancellablejob.hxx>
 #include <threadlistener.hxx>
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index 7c473277b198..b825aa4156d6 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -22,7 +22,7 @@
 #include <editeng/boxitem.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/shaditem.hxx>
-#include "editeng/frmdiritem.hxx"
+#include <editeng/frmdiritem.hxx>
 #include <fmtclds.hxx>
 #include <fmtfsize.hxx>
 #include <pagefrm.hxx>
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 57047c91ae7e..4a59b55812f8 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -67,7 +67,7 @@
 #include <porfld.hxx>
 #include <SwStyleNameMapper.hxx>
 #include <itrpaint.hxx>
-#include "i18nlangtag/languagetag.hxx"
+#include <i18nlangtag/languagetag.hxx>
 #include <IMark.hxx>
 #include <SwNodeNum.hxx>
 #include <switerator.hxx>
diff --git a/sw/source/core/uibase/app/apphdl.cxx b/sw/source/core/uibase/app/apphdl.cxx
index bb02073ffef8..452b752de5c9 100644
--- a/sw/source/core/uibase/app/apphdl.cxx
+++ b/sw/source/core/uibase/app/apphdl.cxx
@@ -93,8 +93,8 @@
 
 #include <vcl/status.hxx>
 
-#include "salhelper/simplereferenceobject.hxx"
-#include "rtl/ref.hxx"
+#include <salhelper/simplereferenceobject.hxx>
+#include <rtl/ref.hxx>
 
 #include <unomid.h>
 
diff --git a/sw/source/core/uibase/app/docsh2.cxx b/sw/source/core/uibase/app/docsh2.cxx
index 3f4ff818a05d..a75632cd3885 100644
--- a/sw/source/core/uibase/app/docsh2.cxx
+++ b/sw/source/core/uibase/app/docsh2.cxx
@@ -100,7 +100,7 @@
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ListboxControlActions.hpp>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
 #include <com/sun/star/script/vba/VBAEventId.hpp>
 #include <editeng/acorrcfg.hxx>
diff --git a/sw/source/core/uibase/app/swdllimpl.hxx b/sw/source/core/uibase/app/swdllimpl.hxx
index b51ab6b49ca2..6849e7fd3c00 100644
--- a/sw/source/core/uibase/app/swdllimpl.hxx
+++ b/sw/source/core/uibase/app/swdllimpl.hxx
@@ -10,10 +10,10 @@
 #ifndef INCLUDED_SW_SOURCE_UI_APP_SWDLLIMPL_HXX
 #define INCLUDED_SW_SOURCE_UI_APP_SWDLLIMPL_HXX
 
-#include "sal/config.h"
+#include <sal/config.h>
 
-#include "boost/noncopyable.hpp"
-#include "boost/scoped_ptr.hpp"
+#include <boost/noncopyable.hpp>
+#include <boost/scoped_ptr.hpp>
 
 namespace sw { class Filters; }
 
diff --git a/sw/source/core/uibase/dbui/dbtree.cxx b/sw/source/core/uibase/dbui/dbtree.cxx
index 1cc2facb9f0b..5a26199fe5f3 100644
--- a/sw/source/core/uibase/dbui/dbtree.cxx
+++ b/sw/source/core/uibase/dbui/dbtree.cxx
@@ -43,7 +43,7 @@
 #include <osl/mutex.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/svapp.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 
 #include <helpid.h>
 #include <utlui.hrc>
diff --git a/sw/source/core/uibase/dbui/mailmergechildwindow.cxx b/sw/source/core/uibase/dbui/mailmergechildwindow.cxx
index 44edd7a426fa..f70074a81e6e 100644
--- a/sw/source/core/uibase/dbui/mailmergechildwindow.cxx
+++ b/sw/source/core/uibase/dbui/mailmergechildwindow.cxx
@@ -31,8 +31,8 @@
 #include <mmconfigitem.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
-#include "com/sun/star/mail/XSmtpService.hpp"
-#include "com/sun/star/mail/MailServiceType.hpp"
+#include <com/sun/star/mail/XSmtpService.hpp>
+#include <com/sun/star/mail/MailServiceType.hpp>
 #include <rtl/ref.hxx>
 #include <maildispatcher.hxx>
 #include <imaildsplistener.hxx>
diff --git a/sw/source/core/uibase/dbui/mailmergehelper.cxx b/sw/source/core/uibase/dbui/mailmergehelper.cxx
index a2f34f5ca04c..f620e9f47258 100644
--- a/sw/source/core/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/core/uibase/dbui/mailmergehelper.cxx
@@ -29,10 +29,10 @@
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdb/XColumn.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
-#include "com/sun/star/mail/MailServiceProvider.hpp"
-#include "com/sun/star/mail/XSmtpService.hpp"
+#include <com/sun/star/mail/MailServiceProvider.hpp>
+#include <com/sun/star/mail/XSmtpService.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/sw/source/core/uibase/dbui/mmconfigitem.cxx b/sw/source/core/uibase/dbui/mmconfigitem.cxx
index 2629fd9e2701..d078732282af 100644
--- a/sw/source/core/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/core/uibase/dbui/mmconfigitem.cxx
@@ -25,9 +25,9 @@
 #include <com/sun/star/sdb/XCompletedConnection.hpp>
 #include <com/sun/star/sdbc/XDataSource.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include "com/sun/star/mail/MailServiceType.hpp"
-#include "com/sun/star/mail/XMailService.hpp"
-#include "com/sun/star/mail/MailServiceProvider.hpp"
+#include <com/sun/star/mail/MailServiceType.hpp>
+#include <com/sun/star/mail/XMailService.hpp>
+#include <com/sun/star/mail/MailServiceProvider.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
diff --git a/sw/source/core/uibase/docvw/srcedtw.cxx b/sw/source/core/uibase/docvw/srcedtw.cxx
index 968f3986b3cf..0f41bdc828b9 100644
--- a/sw/source/core/uibase/docvw/srcedtw.cxx
+++ b/sw/source/core/uibase/docvw/srcedtw.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 <hintids.hxx>
 #include <cmdid.h>
diff --git a/sw/source/core/uibase/inc/conttree.hxx b/sw/source/core/uibase/inc/conttree.hxx
index 8ff250978ef0..62355243cb79 100644
--- a/sw/source/core/uibase/inc/conttree.hxx
+++ b/sw/source/core/uibase/inc/conttree.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_SW_SOURCE_UI_INC_CONTTREE_HXX
 #define INCLUDED_SW_SOURCE_UI_INC_CONTTREE_HXX
 
-#include "svtools/treelistbox.hxx"
-#include "svtools/svlbitm.hxx"
+#include <svtools/treelistbox.hxx>
+#include <svtools/svlbitm.hxx>
 #include "swcont.hxx"
 
 #include <map>
diff --git a/sw/source/core/uibase/inc/glosbib.hxx b/sw/source/core/uibase/inc/glosbib.hxx
index 74803a0f7862..6f93a10bcdb2 100644
--- a/sw/source/core/uibase/inc/glosbib.hxx
+++ b/sw/source/core/uibase/inc/glosbib.hxx
@@ -28,7 +28,7 @@
 
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 
 #include <vector>
 
diff --git a/sw/source/core/uibase/inc/glosdoc.hxx b/sw/source/core/uibase/inc/glosdoc.hxx
index 4c2e63379199..e2fe6ab3d04f 100644
--- a/sw/source/core/uibase/inc/glosdoc.hxx
+++ b/sw/source/core/uibase/inc/glosdoc.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UI_INC_GLOSDOC_HXX
 #define INCLUDED_SW_SOURCE_UI_INC_GLOSDOC_HXX
 
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 #include <com/sun/star/text/XAutoTextGroup.hpp>
 
 class SwTextBlocks;
diff --git a/sw/source/core/uibase/inc/glossary.hxx b/sw/source/core/uibase/inc/glossary.hxx
index d44f5df18342..d69e1760a449 100644
--- a/sw/source/core/uibase/inc/glossary.hxx
+++ b/sw/source/core/uibase/inc/glossary.hxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/text/XAutoTextContainer2.hpp>
 
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 
 #include <actctrl.hxx>
 
diff --git a/sw/source/core/uibase/inc/imaildsplistener.hxx b/sw/source/core/uibase/inc/imaildsplistener.hxx
index 5b7e329df0d7..3631ef259434 100644
--- a/sw/source/core/uibase/inc/imaildsplistener.hxx
+++ b/sw/source/core/uibase/inc/imaildsplistener.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_UI_INC_IMAILDSPLISTENER_HXX
 #define INCLUDED_SW_SOURCE_UI_INC_IMAILDSPLISTENER_HXX
 
-#include "com/sun/star/mail/XMailMessage.hpp"
+#include <com/sun/star/mail/XMailMessage.hpp>
 #include <salhelper/refobj.hxx>
 
 class MailDispatcher;
diff --git a/sw/source/core/uibase/inc/initui.hxx b/sw/source/core/uibase/inc/initui.hxx
index ff4178487166..425a70398bbc 100644
--- a/sw/source/core/uibase/inc/initui.hxx
+++ b/sw/source/core/uibase/inc/initui.hxx
@@ -19,9 +19,9 @@
 #ifndef INCLUDED_SW_SOURCE_UI_INC_INITUI_HXX
 #define INCLUDED_SW_SOURCE_UI_INC_INITUI_HXX
 
-#include "tools/solar.h"
+#include <tools/solar.h>
 #include "swdllapi.h"
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 
 #include <vector>
 
diff --git a/sw/source/core/uibase/inc/maildispatcher.hxx b/sw/source/core/uibase/inc/maildispatcher.hxx
index 76bf4640587b..59732d673eb6 100644
--- a/sw/source/core/uibase/inc/maildispatcher.hxx
+++ b/sw/source/core/uibase/inc/maildispatcher.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_SW_SOURCE_UI_INC_MAILDISPATCHER_HXX
 #define INCLUDED_SW_SOURCE_UI_INC_MAILDISPATCHER_HXX
 
-#include "com/sun/star/mail/XSmtpService.hpp"
-#include "com/sun/star/mail/XMailMessage.hpp"
+#include <com/sun/star/mail/XSmtpService.hpp>
+#include <com/sun/star/mail/XMailMessage.hpp>
 #include <osl/thread.hxx>
 #include <osl/conditn.hxx>
 #include <salhelper/refobj.hxx>
diff --git a/sw/source/core/uibase/inc/mailmergehelper.hxx b/sw/source/core/uibase/inc/mailmergehelper.hxx
index 33b1ded80640..85f378ce162c 100644
--- a/sw/source/core/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/core/uibase/inc/mailmergehelper.hxx
@@ -22,17 +22,17 @@
 #include <svtools/stdctrl.hxx>
 #include <unotools/configitem.hxx>
 #include <com/sun/star/uno/Sequence.h>
-#include "com/sun/star/mail/XAuthenticator.hpp"
-#include "com/sun/star/mail/XConnectionListener.hpp"
-#include "com/sun/star/uno/XCurrentContext.hpp"
-#include "com/sun/star/mail/XMailMessage.hpp"
-#include "com/sun/star/datatransfer/XTransferable.hpp"
+#include <com/sun/star/mail/XAuthenticator.hpp>
+#include <com/sun/star/mail/XConnectionListener.hpp>
+#include <com/sun/star/uno/XCurrentContext.hpp>
+#include <com/sun/star/mail/XMailMessage.hpp>
+#include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/compbase1.hxx>
 #include <cppuhelper/compbase2.hxx>
 #include <vcl/scrbar.hxx>
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 #include "swdllapi.h"
 
 class SwMailMergeConfigItem;
diff --git a/sw/source/core/uibase/inc/mailmergewizard.hxx b/sw/source/core/uibase/inc/mailmergewizard.hxx
index f86599ed0cd2..f3f35e680032 100644
--- a/sw/source/core/uibase/inc/mailmergewizard.hxx
+++ b/sw/source/core/uibase/inc/mailmergewizard.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SW_SOURCE_UI_INC_MAILMERGEWIZARD_HXX
 
 #include <svtools/roadmapwizard.hxx>
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 
 class SwView;
 class SwMailMergeConfigItem;
diff --git a/sw/source/core/uibase/inc/optcomp.hxx b/sw/source/core/uibase/inc/optcomp.hxx
index f73797488a1d..3f4204d1fb63 100644
--- a/sw/source/core/uibase/inc/optcomp.hxx
+++ b/sw/source/core/uibase/inc/optcomp.hxx
@@ -25,7 +25,7 @@
 #include <vcl/lstbox.hxx>
 #include <unotools/compatibility.hxx>
 #include <svx/checklbx.hxx>
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 
 // class SwCompatibilityOptPage ------------------------------------------
 class SwWrtShell;
diff --git a/sw/source/core/uibase/inc/outline.hxx b/sw/source/core/uibase/inc/outline.hxx
index 7b037b56ace9..ecc249976ee4 100644
--- a/sw/source/core/uibase/inc/outline.hxx
+++ b/sw/source/core/uibase/inc/outline.hxx
@@ -37,7 +37,7 @@
 #include "swtypes.hxx"
 #include <numprevw.hxx>
 #include <numberingtypelistbox.hxx>
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 
 class SwWrtShell;
 class SwNumRule;
diff --git a/sw/source/core/uibase/ribbar/inputwin.cxx b/sw/source/core/uibase/ribbar/inputwin.cxx
index 204f96184b6a..3052bc7ba3e6 100644
--- a/sw/source/core/uibase/ribbar/inputwin.cxx
+++ b/sw/source/core/uibase/ribbar/inputwin.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 <comphelper/string.hxx>
 #include <officecfg/Office/Common.hxx>
diff --git a/sw/source/core/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/core/uibase/sidebar/WrapPropertyPanel.cxx
index 6d4e8526f6fc..96d8d344b6f0 100644
--- a/sw/source/core/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/core/uibase/sidebar/WrapPropertyPanel.cxx
@@ -31,7 +31,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 
 const char UNO_WRAPOFF[] = ".uno:WrapOff";
 const char UNO_WRAPLEFT[] = ".uno:WrapLeft";
diff --git a/sw/source/core/uibase/uiview/srcview.cxx b/sw/source/core/uibase/uiview/srcview.cxx
index fd4af00fb369..6b72e4f6c4b7 100644
--- a/sw/source/core/uibase/uiview/srcview.cxx
+++ b/sw/source/core/uibase/uiview/srcview.cxx
@@ -57,7 +57,7 @@
 #include <svl/srchitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/flstitem.hxx>
-#include "editeng/unolingu.hxx"
+#include <editeng/unolingu.hxx>
 #include <sfx2/sfxhtml.hxx>
 #include <swtypes.hxx>
 #include <swmodule.hxx>
diff --git a/sw/source/core/uibase/uiview/view2.cxx b/sw/source/core/uibase/uiview/view2.cxx
index 5964f8e43358..9350cfa714a7 100644
--- a/sw/source/core/uibase/uiview/view2.cxx
+++ b/sw/source/core/uibase/uiview/view2.cxx
@@ -54,7 +54,7 @@
 #include <sfx2/bindings.hxx>
 #include <editeng/lrspitem.hxx>
 #include <unotools/textsearch.hxx>
-#include "editeng/unolingu.hxx"
+#include <editeng/unolingu.hxx>
 #include <vcl/msgbox.hxx>
 #include <editeng/tstpitem.hxx>
 #include <sfx2/event.hxx>
diff --git a/sw/source/core/uibase/uiview/viewsrch.cxx b/sw/source/core/uibase/uiview/viewsrch.cxx
index 5a1e30fd6d69..d9bb583119be 100644
--- a/sw/source/core/uibase/uiview/viewsrch.cxx
+++ b/sw/source/core/uibase/uiview/viewsrch.cxx
@@ -42,7 +42,7 @@
 #include <vcl/layout.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/wrkwin.hxx>
-#include "editeng/unolingu.hxx"
+#include <editeng/unolingu.hxx>
 #include <swmodule.hxx>
 #include <swwait.hxx>
 #include <workctrl.hxx>
diff --git a/sw/source/core/uibase/uno/unofreg.cxx b/sw/source/core/uibase/uno/unofreg.cxx
index 239c5135e2c1..77b6f90a9e2f 100644
--- a/sw/source/core/uibase/uno/unofreg.cxx
+++ b/sw/source/core/uibase/uno/unofreg.cxx
@@ -19,7 +19,7 @@
 
 #include "SwXFilterOptions.hxx"
 #include "unofreg.hxx"
-#include "sal/types.h"
+#include <sal/types.h>
 #include <osl/diagnose.h>
 #include <cppuhelper/factory.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
@@ -30,7 +30,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 
 // #i73788#
-#include "cppuhelper/implementationentry.hxx"
+#include <cppuhelper/implementationentry.hxx>
 namespace comp_FinalThreadManager {
 
 // component and service helper functions:
diff --git a/sw/source/core/uibase/uno/unomailmerge.cxx b/sw/source/core/uibase/uno/unomailmerge.cxx
index f1cc896df356..1ecafb7b3571 100644
--- a/sw/source/core/uibase/uno/unomailmerge.cxx
+++ b/sw/source/core/uibase/uno/unomailmerge.cxx
@@ -47,7 +47,7 @@
 #include <com/sun/star/util/CloseVetoException.hpp>
 #include <com/sun/star/sdbcx/XRowLocate.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
-#include "com/sun/star/mail/XSmtpService.hpp"
+#include <com/sun/star/mail/XSmtpService.hpp>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/event.hxx>
 #include <swevent.hxx>
diff --git a/sw/source/core/uibase/utlui/content.cxx b/sw/source/core/uibase/utlui/content.cxx
index 3225525f9919..1cca1aa77daf 100644
--- a/sw/source/core/uibase/utlui/content.cxx
+++ b/sw/source/core/uibase/utlui/content.cxx
@@ -79,7 +79,7 @@
 #include <redline.hxx>
 #include <docary.hxx>
 #include <o3tl/sorted_vector.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 
 #include "swabstdlg.hxx"
 #include "globals.hrc"
diff --git a/sw/source/core/uibase/utlui/glbltree.cxx b/sw/source/core/uibase/utlui/glbltree.cxx
index e6e4ee078435..2e0e50f50779 100644
--- a/sw/source/core/uibase/utlui/glbltree.cxx
+++ b/sw/source/core/uibase/utlui/glbltree.cxx
@@ -31,7 +31,7 @@
 #include <vcl/graphicfilter.hxx>
 #include <vcl/settings.hxx>
 
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <sfx2/docinsert.hxx>
 #include <sfx2/filedlghelper.hxx>
 
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index cb1d33507584..9bcf75936762 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.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/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx
index 6cfc66fc6661..fb3fdc3e2b48 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -26,7 +26,7 @@
 
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include "editeng/unolingu.hxx"
+#include <editeng/unolingu.hxx>
 #include <com/sun/star/util/SearchOptions.hpp>
 #include <com/sun/star/util/SearchFlags.hpp>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx
index da212eff6828..dd84c4afff7e 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.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 <pagepreviewlayout.hxx>
 #include <prevwpage.hxx>
@@ -33,9 +33,7 @@
 #include <viewopt.hxx>
 #include <swregion.hxx>
 #include <comcore.hrc>
-// OD 19.02.2003 #107369# - method <SwAlignRect(..)>
 #include <frmtool.hxx>
-// OD 24.09.2003 #i19975#
 #include <sfx2/zoomitem.hxx>
 #include <printdata.hxx>
 
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index 8371f1536bbf..02a2ade1d2ac 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -40,7 +40,7 @@
 #include <mdiexp.hxx>
 #include <poolfmt.hxx>
 
-#include "vcl/metric.hxx"
+#include <vcl/metric.hxx>
 
 #define ASC_BUFFLEN 4096
 
diff --git a/sw/source/filter/html/htmlfld.hxx b/sw/source/filter/html/htmlfld.hxx
index 87948a7b6e7b..8472fcf4b62f 100644
--- a/sw/source/filter/html/htmlfld.hxx
+++ b/sw/source/filter/html/htmlfld.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFLD_HXX
 #define INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFLD_HXX
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #define OOO_STRING_SW_HTML_FT_author "AUTHOR"
 #define OOO_STRING_SW_HTML_FT_sender "SENDER"
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 97749ffdc74c..0185a015425b 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.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 <cstring>
 
diff --git a/sw/source/filter/ww8/styles.cxx b/sw/source/filter/ww8/styles.cxx
index 0f06662ef32f..5ad0ee0b2f76 100644
--- a/sw/source/filter/ww8/styles.cxx
+++ b/sw/source/filter/ww8/styles.cxx
@@ -21,7 +21,7 @@
 
 #include <functional>
 #include <algorithm>
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 #include "staticassert.hxx"
 
 namespace
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 2fcf0f6d9d73..523a9ec8e199 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -41,7 +41,7 @@
 #include <editeng/formatbreakitem.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <editeng/tstpitem.hxx>
-#include "svl/urihelper.hxx"
+#include <svl/urihelper.hxx>
 #include <svl/whiter.hxx>
 #include <fmtpdsc.hxx>
 #include <fmtfsize.hxx>
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index a1c2d1124a35..163e4f705eaf 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -24,7 +24,7 @@
 #include <vcl/graphicfilter.hxx>
 #include <vcl/wmf.hxx>
 #include <svl/itemiter.hxx>
-#include "svl/urihelper.hxx"
+#include <svl/urihelper.hxx>
 
 #include <svtools/embedhlp.hxx>
 
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 3d5425cd7c55..6e68f6370c33 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -26,8 +26,8 @@
 
 #include <unotools/ucbstreamhelper.hxx>
 #include <rtl/random.h>
-#include "rtl/ustring.hxx"
-#include "rtl/ustrbuf.hxx"
+#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
 
 #include <sfx2/docinf.hxx>
 #include <sfx2/request.hxx>
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index f3bb9fbe51d9..275d43c8b9ab 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WW8PAR_HXX
 #define INCLUDED_SW_SOURCE_FILTER_WW8_WW8PAR_HXX
 
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 #include <filter/msfilter/msdffimp.hxx>
 #include <filter/msfilter/util.hxx>
 #include <editeng/frmdir.hxx>
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index d4f2b08cffc8..2faf88317b19 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -29,7 +29,7 @@
 #include <algorithm>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 #include "hash_wrap.hxx"
 #include "sortedarray.hxx"
 
diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx
index 98e0f20237fa..fe2c5aabfd31 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -24,7 +24,7 @@
 
 #include <boost/static_assert.hpp>
 #include <osl/endian.h>
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 
 #include <editeng/borderline.hxx>
 #include <filter/msfilter/util.hxx>
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index 557fa782234b..793a77c63c10 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -23,7 +23,7 @@
 #include <comphelper/processfactory.hxx>
 #include <vcl/graph.hxx>
 #include <map>
-#include "sal/log.hxx"
+#include <sal/log.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 2e0934459f89..699b2898a906 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -42,7 +42,7 @@
 #include "xmltexte.hxx"
 #include <SwAppletImpl.hxx>
 
-#include "svl/urihelper.hxx"
+#include <svl/urihelper.hxx>
 #include <sfx2/frmdescr.hxx>
 #include <SwStyleNameMapper.hxx>
 
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 22ab58402588..d465945ea77b 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -30,9 +30,9 @@
 #include <cmdid.h>
 #include <vcl/svapp.hxx>
 #include <comphelper/processfactory.hxx>
-#include "com/sun/star/mail/MailServiceType.hpp"
-#include "com/sun/star/mail/XMailService.hpp"
-#include "com/sun/star/mail/MailServiceProvider.hpp"
+#include <com/sun/star/mail/MailServiceType.hpp>
+#include <com/sun/star/mail/XMailService.hpp>
+#include <com/sun/star/mail/MailServiceProvider.hpp>
 #include <vcl/msgbox.hxx>
 #include <globals.hrc>
 #include <config.hrc>
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index 89530ff1626c..b175199d81c1 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -32,7 +32,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <IDocumentSettingAccess.hxx>
 
 using namespace ::com::sun::star::beans;
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 3b24335757ee..a7f6c0cc4c55 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -44,7 +44,7 @@
 #include <com/sun/star/document/PrinterIndependentLayout.hpp>
 
 #include <svtools/insdlg.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 90ea737bc143..70fac4202f4a 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -32,7 +32,7 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/docfile.hxx>
 #include <rtl/textenc.h>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <tools/urlobj.hxx>
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index 445f028d4910..a7bca54777ad 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -33,7 +33,7 @@
 #include <dbmgr.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <wrtsh.hxx>
-#include "vcl/msgbox.hxx"
+#include <vcl/msgbox.hxx>
 
 #include <helpid.h>
 #include <mailmergewizard.hrc>
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index c7d15ad6f53f..61e014bee555 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdb/XColumn.hpp>
 #include <comphelper/string.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 
 #include <vector>
 #include <boost/scoped_ptr.hpp>
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index 6ff68e85263c..b00cade9b30d 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -34,7 +34,7 @@
 
 #include <dbui.hrc>
 
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index 7c50ac050ae6..e1774fce94fd 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -20,7 +20,7 @@
 #include <swtypes.hxx>
 #include <selectdbtabledialog.hxx>
 #include <dbtablepreviewdialog.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index aa46bab15437..f21149547458 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -39,7 +39,7 @@
 
 #include <dialog.hrc>
 
-#include "vcl/metric.hxx"
+#include <vcl/metric.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 0c19e69b901f..2011284a80d0 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -34,7 +34,7 @@
 #include <sfx2/filedlghelper.hxx>
 #include <editeng/sizeitem.hxx>
 #include <svtools/htmlcfg.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 
 #include <comphelper/storagehelper.hxx>
 #include <uitool.hxx>
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index bfc509bcf697..b6d34271f2e3 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -19,7 +19,7 @@
 
 #include <vcl/waitobj.hxx>
 #include <rtl/ustring.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <swtypes.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index 649323cd6372..256027c5b132 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/text/XTextFieldsSupplier.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
 #include <comphelper/processfactory.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <swtypes.hxx>
 #include <labfmt.hxx>
 #include <unotools.hxx>
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index d0fdd00d48dc..c79bb290fe02 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/sdb/XDatabaseAccess.hpp>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 
 #include <view.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index f2d297b34032..040a048b9137 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -22,7 +22,7 @@
 #include <vcl/svapp.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 
 #include <helpid.h>
 #include <swtypes.hxx>
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 9e5a1f87582f..7b18a1c6ade0 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -33,7 +33,7 @@
 #include <IDocumentMarkAccess.hxx>
 #include <ndtxt.hxx>
 
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 
 #define REFFLDFLAG          0x4000
 #define REFFLDFLAG_BOOKMARK 0x4800
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 9d2b2413902a..adb744e2a5c1 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -29,7 +29,7 @@
 #include <editeng/boxitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/sizeitem.hxx>
-#include "editeng/frmdiritem.hxx"
+#include <editeng/frmdiritem.hxx>
 #include <svl/ctloptions.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 5c168e450835..3908229c0444 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -63,7 +63,7 @@
 
 #include <frmui.hrc>
 #include <sfx2/filedlghelper.hxx>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index aecb9969dcac..33c44030b802 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -38,7 +38,7 @@
 #include <editeng/scripttypeitem.hxx>
 #include <svl/itemset.hxx>
 #include <editeng/langitem.hxx>
-#include "editeng/unolingu.hxx"
+#include <editeng/unolingu.hxx>
 #include <swtypes.hxx>
 #include <idxmrk.hxx>
 #include <txttxmrk.hxx>
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 6015164d6daa..c7e16f9cedcf 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -24,7 +24,7 @@
 #include <unotools/transliterationwrapper.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/pathoptions.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 
 #include <swtypes.hxx>
 #include <glosbib.hxx>
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index b2485084ede8..cec5ce2baea6 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -43,7 +43,7 @@
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <svl/urihelper.hxx>
 #include <unotools/charclass.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <swwait.hxx>
 #include <swtypes.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx
index f1fbdc8b0359..8b3dc9e2d0eb 100644
--- a/sw/source/ui/vba/service.cxx
+++ b/sw/source/ui/vba/service.cxx
@@ -16,10 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "cppuhelper/implementationentry.hxx"
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "com/sun/star/registry/XRegistryKey.hpp"
-#include "comphelper/servicedecl.hxx"
+#include <cppuhelper/implementationentry.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <comphelper/servicedecl.hxx>
 
 // component exports