loplugin:includeform: shell (Windows)

Change-Id: I80109e4e60b0f72efee53509d5539918cec789bd

44 files changed, 131 insertions, 131 deletions

diff --git a/shell/inc/basereader.hxx b/shell/inc/basereader.hxx
index 0acd5e9e615d..8ccb1a5f1490 100644
--- a/shell/inc/basereader.hxx
+++ b/shell/inc/basereader.hxx
@@ -28,7 +28,7 @@
 
 #include "xml_parser.hxx"
 #include "zipfile.hxx"
-#include <filepath.hxx>
+#include "filepath.hxx"
 
 class CBaseReader : public i_xml_parser_event_handler
 {
diff --git a/shell/inc/contentreader.hxx b/shell/inc/contentreader.hxx
index d2d943e5517d..55a943b6dd1a 100644
--- a/shell/inc/contentreader.hxx
+++ b/shell/inc/contentreader.hxx
@@ -22,7 +22,7 @@
 
 #include "basereader.hxx"
 #include <stack>
-#include <filepath.hxx>
+#include "filepath.hxx"
 
 class ITag;
 class StreamInterface;
diff --git a/shell/inc/fileextensions.hxx b/shell/inc/fileextensions.hxx
index 677a7b58a9ea..5c499beb8b4e 100644
--- a/shell/inc/fileextensions.hxx
+++ b/shell/inc/fileextensions.hxx
@@ -23,7 +23,7 @@
 #include "global.hxx"
 
 #include <string>
-#include <filepath.hxx>
+#include "filepath.hxx"
 
 // A simple table with information about the currently used OO file extensions
 // for instance ".sxw" and information about windows registry keys which are
diff --git a/shell/inc/infotips.hxx b/shell/inc/infotips.hxx
index a14569baf1c6..270250d27f04 100644
--- a/shell/inc/infotips.hxx
+++ b/shell/inc/infotips.hxx
@@ -30,7 +30,7 @@
 #pragma warning(pop)
 #endif
 #include <string>
-#include <filepath.hxx>
+#include "filepath.hxx"
 
 class CInfoTip : public IQueryInfo, public IPersistFile
 {
diff --git a/shell/inc/metainforeader.hxx b/shell/inc/metainforeader.hxx
index 436a70f287d8..33e82a532806 100644
--- a/shell/inc/metainforeader.hxx
+++ b/shell/inc/metainforeader.hxx
@@ -23,7 +23,7 @@
 #include "basereader.hxx"
 #include "types.hxx"
 #include <stack>
-#include <filepath.hxx>
+#include "filepath.hxx"
 
 class ITag;
 class CKeywordsTag;
diff --git a/shell/inc/propsheets.hxx b/shell/inc/propsheets.hxx
index 8bb77bac45bc..920ede7ccff3 100644
--- a/shell/inc/propsheets.hxx
+++ b/shell/inc/propsheets.hxx
@@ -31,7 +31,7 @@
 #endif
 #include <string>
 #include <memory>
-#include <filepath.hxx>
+#include "filepath.hxx"
 
 class CPropertySheet : public IShellExtInit, public IShellPropSheetExt
 {
diff --git a/shell/inc/registry.hxx b/shell/inc/registry.hxx
index 4a6d6c843c89..3da9eccd40c6 100644
--- a/shell/inc/registry.hxx
+++ b/shell/inc/registry.hxx
@@ -32,7 +32,7 @@
 #pragma warning(pop)
 #endif
 #include <string>
-#include <filepath.hxx>
+#include "filepath.hxx"
 
 /** Sets a value of the specified registry key, an empty ValueName sets the default
     value
diff --git a/shell/inc/spsupp/COMOpenDocuments.hpp b/shell/inc/spsupp/COMOpenDocuments.hpp
index e6c1f22c59e4..f4543c948587 100644
--- a/shell/inc/spsupp/COMOpenDocuments.hpp
+++ b/shell/inc/spsupp/COMOpenDocuments.hpp
@@ -14,13 +14,13 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
-#include "spsupp_h.h"
+#include <spsupp_h.h>
 #if defined __clang__
 #pragma clang diagnostic pop
 #endif
 #include "COMRefCounted.hpp"
-#include "Objsafe.h"
-#include "assert.h"
+#include <Objsafe.h>
+#include <assert.h>
 
 class COMOpenDocuments : public COMRefCounted<IOWSNewDocument3>
 {
diff --git a/shell/inc/spsupp/COMRefCounted.hpp b/shell/inc/spsupp/COMRefCounted.hpp
index 9647db2fb0aa..5673b66517ae 100644
--- a/shell/inc/spsupp/COMRefCounted.hpp
+++ b/shell/inc/spsupp/COMRefCounted.hpp
@@ -10,8 +10,8 @@
 #ifndef INCLUDED_SHELL_INC_SPSUPP_COMREFCOUNTED_HPP
 #define INCLUDED_SHELL_INC_SPSUPP_COMREFCOUNTED_HPP
 
-#include "objbase.h"
-#include "assert.h"
+#include <objbase.h>
+#include <assert.h>
 
 template <class Interface>
 class COMRefCounted : public Interface
diff --git a/shell/inc/spsupp/registrar.hpp b/shell/inc/spsupp/registrar.hpp
index a2a2db49616a..b055ac8b0d42 100644
--- a/shell/inc/spsupp/registrar.hpp
+++ b/shell/inc/spsupp/registrar.hpp
@@ -13,7 +13,7 @@
 #if !defined WIN32_LEAN_AND_MEAN
 # define WIN32_LEAN_AND_MEAN
 #endif
-#include "windows.h"
+#include <windows.h>
 
 class Registrar {
 public:
diff --git a/shell/inc/stream_helper.hxx b/shell/inc/stream_helper.hxx
index 65667d6fe6ce..bcd2f28f04ff 100644
--- a/shell/inc/stream_helper.hxx
+++ b/shell/inc/stream_helper.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SHELL_INC_INTERNAL_STREAM_HELPER_HXX
 
 #include "types.hxx"
-#include <filepath.hxx>
+#include "filepath.hxx"
 
 struct IStream;
 
diff --git a/shell/inc/zipfile.hxx b/shell/inc/zipfile.hxx
index 4e31ca7ef246..753c4e3cd824 100644
--- a/shell/inc/zipfile.hxx
+++ b/shell/inc/zipfile.hxx
@@ -25,7 +25,7 @@
 #include <string>
 #include <vector>
 #include <memory>
-#include <filepath.hxx>
+#include "filepath.hxx"
 
 class StreamInterface;
 
diff --git a/shell/qa/zip/testzipimpl.hxx b/shell/qa/zip/testzipimpl.hxx
index 8d81fec11fed..b0f4b91b172d 100644
--- a/shell/qa/zip/testzipimpl.hxx
+++ b/shell/qa/zip/testzipimpl.hxx
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_SHELL_QA_ZIP_TESTZIPIMPL_HXX
 #define INCLUDED_SHELL_QA_ZIP_TESTZIPIMPL_HXX
 
-#include "zipfile.hxx"
+#include <zipfile.hxx>
 #include <string>
 #include <vector>
 #include <algorithm>
-#include "sal/types.h"
+#include <sal/types.h>
 
 using namespace std;
 
diff --git a/shell/qa/zip/ziptest.cxx b/shell/qa/zip/ziptest.cxx
index f554e6da71d0..2f09c9abcd50 100644
--- a/shell/qa/zip/ziptest.cxx
+++ b/shell/qa/zip/ziptest.cxx
@@ -30,12 +30,12 @@
 #include <ole2.h>
 #include <stdio.h>
 
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-#include "cppunit/plugin/TestPlugIn.h"
+#include <cppunit/TestAssert.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 #include <string>
-#include "stream_helper.hxx"
+#include <stream_helper.hxx>
 #include "testzipimpl.hxx"
 using namespace std;
 
diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx
index 84c55520b947..522203b040ae 100644
--- a/shell/source/all/xml_parser.cxx
+++ b/shell/source/all/xml_parser.cxx
@@ -22,7 +22,7 @@
 #include <i_xml_parser_event_handler.hxx>
 
 #ifdef _WIN32
-#include "utilities.hxx"
+#include <utilities.hxx>
 #else
 #define UTF8ToWString(s) s
 #endif
diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx
index 56b85de4befc..b1006803d065 100644
--- a/shell/source/backends/wininetbe/wininetbackend.cxx
+++ b/shell/source/backends/wininetbe/wininetbackend.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <cppuhelper/supportsservice.hxx>
-#include "rtl/ustrbuf.hxx"
+#include <rtl/ustrbuf.hxx>
 
 #include "wininetbackend.hxx"
 
diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx
index 3f180df0ed3b..063dc1f47048 100644
--- a/shell/source/backends/wininetbe/wininetbecdef.cxx
+++ b/shell/source/backends/wininetbe/wininetbecdef.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <wininetbackend.hxx>
+#include "wininetbackend.hxx"
 #include <com/sun/star/registry/XRegistryKey.hpp>
 
 #include <cppuhelper/implementationentry.hxx>
diff --git a/shell/source/win32/ooofilereader/basereader.cxx b/shell/source/win32/ooofilereader/basereader.cxx
index e4a64e3384c0..23a594f1df8e 100644
--- a/shell/source/win32/ooofilereader/basereader.cxx
+++ b/shell/source/win32/ooofilereader/basereader.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "basereader.hxx"
+#include <basereader.hxx>
 
-#include "xml_parser.hxx"
+#include <xml_parser.hxx>
 
-#include "assert.h"
+#include <assert.h>
 #include <memory>
 
 /**  constructor of CBaseReader.
diff --git a/shell/source/win32/ooofilereader/contentreader.cxx b/shell/source/win32/ooofilereader/contentreader.cxx
index 68781097dada..97a88f1d8a65 100644
--- a/shell/source/win32/ooofilereader/contentreader.cxx
+++ b/shell/source/win32/ooofilereader/contentreader.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "contentreader.hxx"
+#include <contentreader.hxx>
 #include "dummytag.hxx"
 #include "simpletag.hxx"
 #include "autostyletag.hxx"
 
-#include "assert.h"
+#include <assert.h>
 
 /** constructor.
 */
diff --git a/shell/source/win32/ooofilereader/itag.hxx b/shell/source/win32/ooofilereader/itag.hxx
index 234c31367fd0..841771818257 100644
--- a/shell/source/win32/ooofilereader/itag.hxx
+++ b/shell/source/win32/ooofilereader/itag.hxx
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_ITAG_HXX
 #define INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_ITAG_HXX
 
-#include "config.hxx"
-#include "types.hxx"
+#include <config.hxx>
+#include <types.hxx>
 
 /***************************   interface of tag readers   ***************************/
 
diff --git a/shell/source/win32/ooofilereader/metainforeader.cxx b/shell/source/win32/ooofilereader/metainforeader.cxx
index afdf3418fd07..52a9117d7e4e 100644
--- a/shell/source/win32/ooofilereader/metainforeader.cxx
+++ b/shell/source/win32/ooofilereader/metainforeader.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "metainforeader.hxx"
+#include <metainforeader.hxx>
 #include "dummytag.hxx"
 #include "simpletag.hxx"
 #include "keywordstag.hxx"
 
-#include "assert.h"
+#include <assert.h>
 
 /** constructor.
 */
diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx
index 80dfad61b26c..1f4200521778 100644
--- a/shell/source/win32/shlxthandler/classfactory.cxx
+++ b/shell/source/win32/shlxthandler/classfactory.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "global.hxx"
+#include <global.hxx>
 #include "classfactory.hxx"
-#include "infotips.hxx"
-#include "propsheets.hxx"
-#include "columninfo.hxx"
-#include "thumbviewer.hxx"
-#include "shlxthdl.hxx"
+#include <infotips.hxx>
+#include <propsheets.hxx>
+#include <columninfo.hxx>
+#include <thumbviewer.hxx>
+#include <shlxthdl.hxx>
 
 
 long CClassFactory::s_ServerLocks = 0;
diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
index 933d695f98fe..8d8ffbed4483 100644
--- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
+++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "global.hxx"
-#include "columninfo.hxx"
-#include "fileextensions.hxx"
-#include "metainforeader.hxx"
-#include "utilities.hxx"
-#include "config.hxx"
+#include <global.hxx>
+#include <columninfo.hxx>
+#include <fileextensions.hxx>
+#include <metainforeader.hxx>
+#include <utilities.hxx>
+#include <config.hxx>
 
 #include <sal/macros.h>
 #include <malloc.h>
diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx
index c15f9723deb7..87fce0d29398 100644
--- a/shell/source/win32/shlxthandler/infotips/infotips.cxx
+++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx
@@ -17,18 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "global.hxx"
-#include "infotips.hxx"
-#include "shlxthdl.hxx"
-#include "metainforeader.hxx"
-#include "contentreader.hxx"
-#include "utilities.hxx"
-#include "registry.hxx"
-#include "fileextensions.hxx"
-#include "iso8601_converter.hxx"
-#include "config.hxx"
-
-#include "resource.h"
+#include <global.hxx>
+#include <infotips.hxx>
+#include <shlxthdl.hxx>
+#include <metainforeader.hxx>
+#include <contentreader.hxx>
+#include <utilities.hxx>
+#include <registry.hxx>
+#include <fileextensions.hxx>
+#include <iso8601_converter.hxx>
+#include <config.hxx>
+
+#include <resource.h>
 #include <stdio.h>
 #include <utility>
 #include <stdlib.h>
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index f74473b5e3f4..4443287f736c 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -28,10 +28,10 @@
 
 //  Platform:   Windows 2000, Windows XP
 
-#include "contentreader.hxx"
-#include "metainforeader.hxx"
-#include "registry.hxx"
-#include "fileextensions.hxx"
+#include <contentreader.hxx>
+#include <metainforeader.hxx>
+#include <registry.hxx>
+#include <fileextensions.hxx>
 
 
 //  Include file    Purpose
@@ -59,13 +59,13 @@
 #include <filter.h>
 #include <filterr.h>
 #include <ntquery.h>
-#include "assert.h"
+#include <assert.h>
 #include "ooofilt.hxx"
 #include <objidl.h>
 #include <stdio.h>
 #include "propspec.hxx"
 
-#include "stream_helper.hxx"
+#include <stream_helper.hxx>
 
 //C-------------------------------------------------------------------------
 //  Class:      COooFilter
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
index 96ca3a3d0337..f63b86f956fb 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_OOOFILT_OOOFILT_HXX
 #define INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_OOOFILT_OOOFILT_HXX
 
-#include "types.hxx"
+#include <types.hxx>
 
 //+-------------------------------------------------------------------------
 //  Contents:   LibreOffice filter declarations
diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
index 133dcd1d8008..3c734be76fe4 100644
--- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
@@ -31,7 +31,7 @@
 
 #include <stdio.h>
 #include <objidl.h>
-#include "stream_helper.hxx"
+#include <stream_helper.hxx>
 
 BufferStream::BufferStream(IStream *str) :
     stream(str)
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index 41b100413f14..dd71a44f2390 100644
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "global.hxx"
-#include "propertyhdl.hxx"
-#include "fileextensions.hxx"
-#include "metainforeader.hxx"
-#include "utilities.hxx"
-#include "config.hxx"
+#include <global.hxx>
+#include <propertyhdl.hxx>
+#include <fileextensions.hxx>
+#include <metainforeader.hxx>
+#include <utilities.hxx>
+#include <config.hxx>
 
 #include <propkey.h>
 #include <propvarutil.h>
@@ -31,7 +31,7 @@
 #include <malloc.h>
 #include <strsafe.h>
 
-#include "stream_helper.hxx"
+#include <stream_helper.hxx>
 
 
 // Module global
diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
index ce1b74565393..a158366f7a46 100644
--- a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
@@ -22,12 +22,12 @@
 #pragma warning (disable : 4786 4503)
 #endif
 #include "document_statistic.hxx"
-#include "utilities.hxx"
-#include "metainforeader.hxx"
-#include "resource.h"
-#include "fileextensions.hxx"
-#include "config.hxx"
-#include "iso8601_converter.hxx"
+#include <utilities.hxx>
+#include <metainforeader.hxx>
+#include <resource.h>
+#include <fileextensions.hxx>
+#include <config.hxx>
+#include <iso8601_converter.hxx>
 
 const bool READONLY  = false;
 
diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
index 424dbe4c4649..e6f0dc5dc29a 100644
--- a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
+++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
@@ -24,7 +24,7 @@
 #include <string>
 #include <memory>
 #include <vector>
-#include "metainforeader.hxx"
+#include <metainforeader.hxx>
 
 
 struct statistic_item
diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
index bc3561db7710..a3143f966ae6 100644
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
@@ -24,11 +24,11 @@
 
 #include "listviewbuilder.hxx"
 #include "document_statistic.hxx"
-#include "utilities.hxx"
-#include "config.hxx"
+#include <utilities.hxx>
+#include <config.hxx>
 
 #include <commctrl.h>
-#include "resource.h"
+#include <resource.h>
 
 // Unicode-only defines to break dependence on UNICODE define
 #if !defined ListView_InsertColumnW
diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
index 99933f6169f1..4f9d7203a6c2 100644
--- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "config.hxx"
-#include "global.hxx"
+#include <config.hxx>
+#include <global.hxx>
 
-#include "propsheets.hxx"
-#include "utilities.hxx"
-#include "resource.h"
+#include <propsheets.hxx>
+#include <utilities.hxx>
+#include <resource.h>
 #include "listviewbuilder.hxx"
 
 #if defined _MSC_VER
diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx
index 47d93d054c25..8cf408688ab6 100644
--- a/shell/source/win32/shlxthandler/shlxthdl.cxx
+++ b/shell/source/win32/shlxthandler/shlxthdl.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "config.hxx"
-#include "global.hxx"
-#include "shlxthdl.hxx"
+#include <config.hxx>
+#include <global.hxx>
+#include <shlxthdl.hxx>
 #include "classfactory.hxx"
-#include "registry.hxx"
-#include "fileextensions.hxx"
-#include "utilities.hxx"
+#include <registry.hxx>
+#include <fileextensions.hxx>
+#include <utilities.hxx>
 
 #include <string>
 #include <shlobj.h>
diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
index 56d58e919aea..4fe52c351bc9 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
+++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
@@ -20,17 +20,17 @@
 #ifndef DONT_HAVE_GDIPLUS
 
 
-#include "global.hxx"
+#include <global.hxx>
 
-#include "thumbviewer.hxx"
-#include "shlxthdl.hxx"
-#include "registry.hxx"
-#include "fileextensions.hxx"
-#include "config.hxx"
-#include "zipfile.hxx"
-#include "utilities.hxx"
+#include <thumbviewer.hxx>
+#include <shlxthdl.hxx>
+#include <registry.hxx>
+#include <fileextensions.hxx>
+#include <config.hxx>
+#include <zipfile.hxx>
+#include <utilities.hxx>
 
-#include "resource.h"
+#include <resource.h>
 
 #include <stdio.h>
 #include <utility>
diff --git a/shell/source/win32/shlxthandler/util/fileextensions.cxx b/shell/source/win32/shlxthandler/util/fileextensions.cxx
index af13af50d469..f76ac53d5387 100644
--- a/shell/source/win32/shlxthandler/util/fileextensions.cxx
+++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "algorithm"
-#include "fileextensions.hxx"
+#include <algorithm>
+#include <fileextensions.hxx>
 #include <rtl/character.hxx>
 #include <sal/macros.h>
 
diff --git a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
index 495ab470b358..12ed69e549cf 100644
--- a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
+++ b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <stdlib.h>
 
-#include "iso8601_converter.hxx"
-#include "utilities.hxx"
+#include <iso8601_converter.hxx>
+#include <utilities.hxx>
 
 #include <sstream>
 #include <iomanip>
diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx
index f7dc281c9818..d853ea54b53c 100644
--- a/shell/source/win32/shlxthandler/util/registry.cxx
+++ b/shell/source/win32/shlxthandler/util/registry.cxx
@@ -29,7 +29,7 @@
 #pragma warning(pop)
 #endif
 #include <malloc.h>
-#include "registry.hxx"
+#include <registry.hxx>
 
 #if defined _MSC_VER
 #pragma warning(push, 1)
diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx b/shell/source/win32/shlxthandler/util/utilities.cxx
index 29395b6d36e0..3a7494b7cc97 100644
--- a/shell/source/win32/shlxthandler/util/utilities.cxx
+++ b/shell/source/win32/shlxthandler/util/utilities.cxx
@@ -21,8 +21,8 @@
 
 #include <memory>
 
-#include "config.hxx"
-#include "utilities.hxx"
+#include <config.hxx>
+#include <utilities.hxx>
 
 // constants
 
diff --git a/shell/source/win32/spsupp/COMOpenDocuments.cxx b/shell/source/win32/spsupp/COMOpenDocuments.cxx
index c1efe033409c..3412598d94c2 100644
--- a/shell/source/win32/spsupp/COMOpenDocuments.cxx
+++ b/shell/source/win32/spsupp/COMOpenDocuments.cxx
@@ -12,9 +12,9 @@
 #include <cstring>
 #include <vector>
 
-#include "COMOpenDocuments.hpp"
-#include "spsuppServ.hpp"
-#include "stdio.h"
+#include <COMOpenDocuments.hpp>
+#include <spsuppServ.hpp>
+#include <stdio.h>
 
 // Display confirmation dialog, return false on negative answer
 bool SecurityWarning(const wchar_t* sProgram, const wchar_t* sDocument)
diff --git a/shell/source/win32/spsupp/registrar.cxx b/shell/source/win32/spsupp/registrar.cxx
index 9a5718dcd884..7c3bbb881612 100644
--- a/shell/source/win32/spsupp/registrar.cxx
+++ b/shell/source/win32/spsupp/registrar.cxx
@@ -7,9 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "registrar.hpp"
-#include "wchar.h"
-#include "objbase.h"
+#include <registrar.hpp>
+#include <wchar.h>
+#include <objbase.h>
 
 namespace {
 
diff --git a/shell/source/win32/spsupp/spsuppClassFactory.cxx b/shell/source/win32/spsupp/spsuppClassFactory.cxx
index c6c2d48603a6..737e43b440d3 100644
--- a/shell/source/win32/spsupp/spsuppClassFactory.cxx
+++ b/shell/source/win32/spsupp/spsuppClassFactory.cxx
@@ -7,8 +7,8 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-#include "spsuppClassFactory.hpp"
-#include "COMOpenDocuments.hpp"
+#include <spsuppClassFactory.hpp>
+#include <COMOpenDocuments.hpp>
 
 long ClassFactory::m_nObjCount = 0;
 long ClassFactory::m_nLockCount = 0;
diff --git a/shell/source/win32/spsupp/spsuppServ.cxx b/shell/source/win32/spsupp/spsuppServ.cxx
index bfa5710b46b8..6fdd4c0e5396 100644
--- a/shell/source/win32/spsupp/spsuppServ.cxx
+++ b/shell/source/win32/spsupp/spsuppServ.cxx
@@ -13,18 +13,18 @@
 #pragma clang diagnostic ignored "-Wextra-tokens"
     // "#endif !_MIDL_USE_GUIDDEF_" in midl-generated code
 #endif
-#include "spsupp_i.c"
+#include <spsupp_i.c>
 #if defined __clang__
 #pragma clang diagnostic pop
 #endif
 
 #include <memory>
-#include "olectl.h"
-#include "wchar.h"
-#include "spsuppServ.hpp"
-#include "spsuppClassFactory.hpp"
-#include "COMOpenDocuments.hpp"
-#include "registrar.hpp"
+#include <olectl.h>
+#include <wchar.h>
+#include <spsuppServ.hpp>
+#include <spsuppClassFactory.hpp>
+#include <COMOpenDocuments.hpp>
+#include <registrar.hpp>
 
 namespace {
 
diff --git a/shell/source/win32/zipfile/zipexcptn.cxx b/shell/source/win32/zipfile/zipexcptn.cxx
index cea21fe7f69e..623d511fb592 100644
--- a/shell/source/win32/zipfile/zipexcptn.cxx
+++ b/shell/source/win32/zipfile/zipexcptn.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "global.hxx"
+#include <global.hxx>
 #include "zipexcptn.hxx"
 
 
diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx
index f1fca5276d30..1a1ee62fe4ec 100644
--- a/shell/source/win32/zipfile/zipfile.cxx
+++ b/shell/source/win32/zipfile/zipfile.cxx
@@ -18,10 +18,10 @@
  */
 
 #include "zipexcptn.hxx"
-#include "zipfile.hxx"
-#include "global.hxx"
-#include "types.hxx"
-#include "stream_helper.hxx"
+#include <zipfile.hxx>
+#include <global.hxx>
+#include <types.hxx>
+#include <stream_helper.hxx>
 
 #include <malloc.h>
 #include <algorithm>