[Libreoffice-commits] core.git: 26 commits - bean/native bridges/source canvas/source chart2/qa connectivity/source dbaccess/source desktop/source dtrans/source embeddedobj/source embedserv/source extensions/source fpicker/source hwpfilter/source i18nlangtag/source include/systools jurt/source odk/source pyuno/zipcore sal/osl setup_native/source sfx2/source shell/inc shell/qa shell/source tools/source vcl/inc vcl/opengl vcl/qa vcl/source vcl/win winaccessibility/inc winaccessibility/source xmlsecurity/source

Stephan Bergmann sbergman at redhat.com
Fri Oct 27 17:29:18 UTC 2017


 bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c              |    2 
 bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx                       |    8 +-
 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx                        |   10 +--
 bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx                          |    2 
 bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx                       |    8 +-
 canvas/source/directx/dx_winstuff.hxx                                      |    4 -
 chart2/qa/extras/xshape/chart2xshape.cxx                                   |    2 
 connectivity/source/drivers/ado/ACallableStatement.cxx                     |    2 
 connectivity/source/drivers/ado/ACatalog.cxx                               |   12 +--
 connectivity/source/drivers/ado/AColumn.cxx                                |    8 +-
 connectivity/source/drivers/ado/AColumns.cxx                               |   10 +--
 connectivity/source/drivers/ado/AConnection.cxx                            |   16 ++---
 connectivity/source/drivers/ado/ADatabaseMetaData.cxx                      |   10 +--
 connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx                  |   16 ++---
 connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx             |    4 -
 connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx     |    4 -
 connectivity/source/drivers/ado/ADriver.cxx                                |   16 ++---
 connectivity/source/drivers/ado/AGroup.cxx                                 |    8 +-
 connectivity/source/drivers/ado/AGroups.cxx                                |   12 +--
 connectivity/source/drivers/ado/AIndex.cxx                                 |    6 -
 connectivity/source/drivers/ado/AIndexes.cxx                               |   10 +--
 connectivity/source/drivers/ado/AKey.cxx                                   |    6 -
 connectivity/source/drivers/ado/AKeys.cxx                                  |   10 +--
 connectivity/source/drivers/ado/APreparedStatement.cxx                     |   10 +--
 connectivity/source/drivers/ado/AResultSet.cxx                             |    4 -
 connectivity/source/drivers/ado/AResultSetMetaData.cxx                     |    4 -
 connectivity/source/drivers/ado/AStatement.cxx                             |    6 -
 connectivity/source/drivers/ado/ATable.cxx                                 |   16 ++---
 connectivity/source/drivers/ado/ATables.cxx                                |   14 ++--
 connectivity/source/drivers/ado/AUser.cxx                                  |   10 +--
 connectivity/source/drivers/ado/AUsers.cxx                                 |   10 +--
 connectivity/source/drivers/ado/AView.cxx                                  |    8 +-
 connectivity/source/drivers/ado/AViews.cxx                                 |   16 ++---
 connectivity/source/drivers/ado/Aolevariant.cxx                            |    6 -
 connectivity/source/drivers/ado/Aservices.cxx                              |    2 
 connectivity/source/drivers/ado/Awrapado.cxx                               |    4 -
 connectivity/source/drivers/ado/adoimp.cxx                                 |    4 -
 connectivity/source/inc/ado/ACallableStatement.hxx                         |    2 
 connectivity/source/inc/ado/ACatalog.hxx                                   |    2 
 connectivity/source/inc/ado/AColumn.hxx                                    |    2 
 connectivity/source/inc/ado/AColumns.hxx                                   |    2 
 connectivity/source/inc/ado/AConnection.hxx                                |    6 -
 connectivity/source/inc/ado/ADatabaseMetaData.hxx                          |    2 
 connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx                 |    2 
 connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx         |    6 -
 connectivity/source/inc/ado/AGroup.hxx                                     |    2 
 connectivity/source/inc/ado/AGroups.hxx                                    |    4 -
 connectivity/source/inc/ado/AIndex.hxx                                     |    2 
 connectivity/source/inc/ado/AIndexes.hxx                                   |    2 
 connectivity/source/inc/ado/AKey.hxx                                       |    2 
 connectivity/source/inc/ado/AKeys.hxx                                      |    2 
 connectivity/source/inc/ado/APreparedStatement.hxx                         |    2 
 connectivity/source/inc/ado/AResultSet.hxx                                 |    2 
 connectivity/source/inc/ado/AResultSetMetaData.hxx                         |    6 -
 connectivity/source/inc/ado/AStatement.hxx                                 |    4 -
 connectivity/source/inc/ado/ATable.hxx                                     |    4 -
 connectivity/source/inc/ado/ATables.hxx                                    |    4 -
 connectivity/source/inc/ado/AUser.hxx                                      |    2 
 connectivity/source/inc/ado/AUsers.hxx                                     |    4 -
 connectivity/source/inc/ado/AView.hxx                                      |    2 
 connectivity/source/inc/ado/AViews.hxx                                     |    4 -
 connectivity/source/inc/ado/Aolevariant.hxx                                |    4 -
 connectivity/source/inc/ado/Awrapado.hxx                                   |   10 +--
 connectivity/source/inc/ado/Awrapadox.hxx                                  |   26 ++++----
 connectivity/source/inc/ado/WrapCatalog.hxx                                |    2 
 connectivity/source/inc/ado/WrapColumn.hxx                                 |    6 -
 connectivity/source/inc/ado/WrapIndex.hxx                                  |    2 
 connectivity/source/inc/ado/WrapKey.hxx                                    |    2 
 connectivity/source/inc/ado/WrapTable.hxx                                  |    2 
 connectivity/source/inc/ado/adoimp.hxx                                     |    4 -
 dbaccess/source/ui/dlg/adodatalinks.cxx                                    |    2 
 dbaccess/source/ui/dlg/adodatalinks.hxx                                    |    2 
 desktop/source/app/cmdlinehelp.cxx                                         |    6 -
 dtrans/source/generic/clipboardmanager.cxx                                 |    2 
 dtrans/source/generic/dtrans.cxx                                           |    4 -
 dtrans/source/generic/generic_clipboard.cxx                                |    2 
 dtrans/source/win32/dtobj/DOTransferable.cxx                               |    2 
 dtrans/source/win32/dtobj/DTransHelper.hxx                                 |    2 
 dtrans/source/win32/dtobj/DataFmtTransl.cxx                                |    2 
 dtrans/source/win32/dtobj/FetcList.cxx                                     |    2 
 dtrans/source/win32/ftransl/ftransl.hxx                                    |    2 
 embeddedobj/source/msole/advisesink.cxx                                    |    4 -
 embeddedobj/source/msole/advisesink.hxx                                    |    2 
 embeddedobj/source/msole/graphconvert.cxx                                  |    4 -
 embeddedobj/source/msole/oleembed.cxx                                      |    2 
 embeddedobj/source/msole/olemisc.cxx                                       |    2 
 embeddedobj/source/msole/olepersist.cxx                                    |    2 
 embeddedobj/source/msole/olevisual.cxx                                     |    2 
 embeddedobj/source/msole/olewrapclient.hxx                                 |    2 
 embeddedobj/source/msole/platform.h                                        |    2 
 embeddedobj/source/msole/xdialogcreator.cxx                                |    2 
 embedserv/source/embed/docholder.cxx                                       |   12 +--
 embedserv/source/embed/ed_idataobj.cxx                                     |    2 
 embedserv/source/embed/ed_iinplace.cxx                                     |    2 
 embedserv/source/embed/ed_ioleobject.cxx                                   |    2 
 embedserv/source/embed/ed_ipersiststr.cxx                                  |    4 -
 embedserv/source/embed/esdll.cxx                                           |    6 -
 embedserv/source/embed/guid.cxx                                            |    4 -
 embedserv/source/embed/iipaobj.cxx                                         |    4 -
 embedserv/source/embed/register.cxx                                        |    2 
 embedserv/source/embed/servprov.cxx                                        |    6 -
 embedserv/source/embed/syswinwrapper.cxx                                   |    4 -
 embedserv/source/embed/tracker.cxx                                         |    4 -
 embedserv/source/inprocserv/advisesink.cxx                                 |    2 
 embedserv/source/inprocserv/dllentry.cxx                                   |    4 -
 embedserv/source/inprocserv/inprocembobj.cxx                               |    2 
 extensions/source/activex/SOActionsApproval.cxx                            |    2 
 extensions/source/activex/SOActionsApproval.h                              |    2 
 extensions/source/activex/SOActiveX.cxx                                    |    2 
 extensions/source/activex/SOActiveX.h                                      |    2 
 extensions/source/activex/SOComWindowPeer.cxx                              |    2 
 extensions/source/activex/SOComWindowPeer.h                                |    2 
 extensions/source/activex/SODispatchInterceptor.cxx                        |    4 -
 extensions/source/activex/SODispatchInterceptor.h                          |    2 
 extensions/source/activex/so_activex.cxx                                   |    6 -
 extensions/source/ole/jscriptclasses.hxx                                   |    2 
 extensions/source/ole/ole2uno.cxx                                          |    4 -
 extensions/source/ole/ole2uno.hxx                                          |    2 
 extensions/source/ole/unotypewrapper.cxx                                   |    2 
 extensions/source/ole/unotypewrapper.hxx                                   |    2 
 extensions/source/ole/windata.hxx                                          |    4 -
 extensions/source/scanner/scanwin.cxx                                      |    2 
 extensions/source/update/check/onlinecheck.cxx                             |    2 
 fpicker/source/win32/misc/resourceprovider.cxx                             |    2 
 hwpfilter/source/precompile.h                                              |    4 -
 i18nlangtag/source/isolang/inwnt.cxx                                       |    2 
 include/systools/win32/uwinapi.h                                           |    2 
 jurt/source/pipe/wrapper/wrapper.c                                         |    6 -
 odk/source/unoapploader/win/unoapploader.c                                 |    4 -
 pyuno/zipcore/python.cxx                                                   |    2 
 sal/osl/w32/backtrace.cxx                                                  |    2 
 sal/osl/w32/dllentry.cxx                                                   |    4 -
 sal/osl/w32/file_error.cxx                                                 |    2 
 sal/osl/w32/file_error.hxx                                                 |    2 
 sal/osl/w32/file_url.cxx                                                   |    2 
 sal/osl/w32/file_url.hxx                                                   |    8 +-
 sal/osl/w32/nlsupport.cxx                                                  |    2 
 sal/osl/w32/process.cxx                                                    |    4 -
 sal/osl/w32/procimpl.cxx                                                   |    2 
 sal/osl/w32/salinit.cxx                                                    |    2 
 sal/osl/w32/tempfile.cxx                                                   |    6 -
 sal/osl/w32/thread.cxx                                                     |    2 
 sal/osl/w32/time.cxx                                                       |    4 -
 setup_native/source/win32/customactions/sellang/sellang.cxx                |    2 
 setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx |    2 
 setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx   |    2 
 sfx2/source/appl/shutdowniconw32.cxx                                       |    2 
 shell/inc/basereader.hxx                                                   |    2 
 shell/inc/contentreader.hxx                                                |    2 
 shell/inc/fileextensions.hxx                                               |    2 
 shell/inc/infotips.hxx                                                     |    2 
 shell/inc/metainforeader.hxx                                               |    2 
 shell/inc/propsheets.hxx                                                   |    2 
 shell/inc/registry.hxx                                                     |    2 
 shell/inc/spsupp/COMOpenDocuments.hpp                                      |    6 -
 shell/inc/spsupp/COMRefCounted.hpp                                         |    4 -
 shell/inc/spsupp/registrar.hpp                                             |    2 
 shell/inc/stream_helper.hxx                                                |    2 
 shell/inc/zipfile.hxx                                                      |    2 
 shell/qa/zip/testzipimpl.hxx                                               |    4 -
 shell/qa/zip/ziptest.cxx                                                   |   10 +--
 shell/source/all/xml_parser.cxx                                            |    2 
 shell/source/backends/wininetbe/wininetbackend.cxx                         |    2 
 shell/source/backends/wininetbe/wininetbecdef.cxx                          |    2 
 shell/source/win32/ooofilereader/basereader.cxx                            |    6 -
 shell/source/win32/ooofilereader/contentreader.cxx                         |    4 -
 shell/source/win32/ooofilereader/itag.hxx                                  |    4 -
 shell/source/win32/ooofilereader/metainforeader.cxx                        |    4 -
 shell/source/win32/shlxthandler/classfactory.cxx                           |   12 +--
 shell/source/win32/shlxthandler/columninfo/columninfo.cxx                  |   12 +--
 shell/source/win32/shlxthandler/infotips/infotips.cxx                      |   24 +++----
 shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx                        |   12 +--
 shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx                        |    2 
 shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx                  |    2 
 shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx                    |   14 ++--
 shell/source/win32/shlxthandler/propsheets/document_statistic.cxx          |   12 +--
 shell/source/win32/shlxthandler/propsheets/document_statistic.hxx          |    2 
 shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx             |    6 -
 shell/source/win32/shlxthandler/propsheets/propsheets.cxx                  |   10 +--
 shell/source/win32/shlxthandler/shlxthdl.cxx                               |   12 +--
 shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx                |   18 ++---
 shell/source/win32/shlxthandler/util/fileextensions.cxx                    |    4 -
 shell/source/win32/shlxthandler/util/iso8601_converter.cxx                 |    6 -
 shell/source/win32/shlxthandler/util/registry.cxx                          |    2 
 shell/source/win32/shlxthandler/util/utilities.cxx                         |    4 -
 shell/source/win32/spsupp/COMOpenDocuments.cxx                             |    6 -
 shell/source/win32/spsupp/registrar.cxx                                    |    6 -
 shell/source/win32/spsupp/spsuppClassFactory.cxx                           |    4 -
 shell/source/win32/spsupp/spsuppServ.cxx                                   |   14 ++--
 shell/source/win32/zipfile/zipexcptn.cxx                                   |    2 
 shell/source/win32/zipfile/zipfile.cxx                                     |    8 +-
 tools/source/generic/config.cxx                                            |    2 
 vcl/inc/opengl/win/WinDeviceInfo.hxx                                       |    2 
 vcl/inc/opengl/win/blocklist_parser.hxx                                    |    2 
 vcl/inc/opengl/win/gdiimpl.hxx                                             |    8 +-
 vcl/inc/win/DWriteTextRenderer.hxx                                         |    2 
 vcl/inc/win/saldata.hxx                                                    |    2 
 vcl/inc/win/salgdi.h                                                       |   18 ++---
 vcl/inc/win/winlayout.hxx                                                  |    2 
 vcl/opengl/win/WinDeviceInfo.cxx                                           |    4 -
 vcl/opengl/win/blocklist_parser.cxx                                        |    2 
 vcl/opengl/win/gdiimpl.cxx                                                 |    4 -
 vcl/qa/cppunit/blocklistparsertest.cxx                                     |    2 
 vcl/source/app/settings.cxx                                                |    2 
 vcl/source/opengl/OpenGLHelper.cxx                                         |    2 
 vcl/win/app/saldata.cxx                                                    |    4 -
 vcl/win/app/salinfo.cxx                                                    |   14 ++--
 vcl/win/app/salinst.cxx                                                    |   32 +++++-----
 vcl/win/gdi/DWriteTextRenderer.cxx                                         |    8 +-
 vcl/win/gdi/gdiimpl.cxx                                                    |   12 +--
 vcl/win/gdi/gdiimpl.hxx                                                    |    8 +-
 vcl/win/gdi/salbmp.cxx                                                     |    4 -
 vcl/win/gdi/salfont.cxx                                                    |   18 ++---
 vcl/win/gdi/salgdi.cxx                                                     |    4 -
 vcl/win/gdi/salgdi2.cxx                                                    |    6 -
 vcl/win/gdi/salnativewidgets-luna.cxx                                      |   16 ++---
 vcl/win/gdi/salvd.cxx                                                      |    2 
 vcl/win/gdi/winlayout.cxx                                                  |   14 ++--
 winaccessibility/inc/AccObject.hxx                                         |    2 
 winaccessibility/inc/AccObjectWinManager.hxx                               |    2 
 winaccessibility/inc/accHelper.hxx                                         |    2 
 winaccessibility/source/UAccCOM/AccAction.cxx                              |    2 
 winaccessibility/source/UAccCOM/AccComponent.cxx                           |    2 
 winaccessibility/source/UAccCOM/AccEditableText.cxx                        |    2 
 winaccessibility/source/UAccCOM/AccHyperLink.cxx                           |    2 
 winaccessibility/source/UAccCOM/AccHypertext.cxx                           |    2 
 winaccessibility/source/UAccCOM/AccImage.cxx                               |    2 
 winaccessibility/source/UAccCOM/AccRelation.cxx                            |    2 
 winaccessibility/source/UAccCOM/AccTable.cxx                               |    2 
 winaccessibility/source/UAccCOM/AccText.cxx                                |    2 
 winaccessibility/source/UAccCOM/AccValue.cxx                               |    2 
 winaccessibility/source/UAccCOM/EnumVariant.cxx                            |    2 
 winaccessibility/source/UAccCOM/EnumVariant.h                              |    2 
 winaccessibility/source/UAccCOM/MAccessible.cxx                            |    2 
 winaccessibility/source/UAccCOM/UAccCOM.cxx                                |    6 -
 winaccessibility/source/UAccCOM/UNOXWrapper.cxx                            |    2 
 winaccessibility/source/UAccCOM/UNOXWrapper.h                              |    2 
 winaccessibility/source/service/AccComponentEventListener.cxx              |    6 -
 winaccessibility/source/service/AccContainerEventListener.cxx              |    6 -
 winaccessibility/source/service/AccDescendantManagerEventListener.cxx      |    6 -
 winaccessibility/source/service/AccDialogEventListener.cxx                 |    6 -
 winaccessibility/source/service/AccEventListener.cxx                       |    6 -
 winaccessibility/source/service/AccFrameEventListener.cxx                  |    6 -
 winaccessibility/source/service/AccListEventListener.cxx                   |    6 -
 winaccessibility/source/service/AccMenuEventListener.cxx                   |    6 -
 winaccessibility/source/service/AccObject.cxx                              |    6 -
 winaccessibility/source/service/AccObjectContainerEventListener.cxx        |    6 -
 winaccessibility/source/service/AccObjectManagerAgent.cxx                  |    6 -
 winaccessibility/source/service/AccObjectWinManager.cxx                    |   32 +++++-----
 winaccessibility/source/service/AccParagraphEventListener.cxx              |    6 -
 winaccessibility/source/service/AccTableEventListener.cxx                  |    6 -
 winaccessibility/source/service/AccTextComponentEventListener.cxx          |    6 -
 winaccessibility/source/service/AccTopWindowListener.cxx                   |    4 -
 winaccessibility/source/service/AccTreeEventListener.cxx                   |    6 -
 winaccessibility/source/service/AccWindowEventListener.cxx                 |    6 -
 winaccessibility/source/service/ResIDGenerator.cxx                         |    2 
 winaccessibility/source/service/msaaservice_impl.cxx                       |    2 
 xmlsecurity/source/xmlsec/errorcallback.cxx                                |    2 
 xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx                               |    2 
 xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx             |    4 -
 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx      |    6 -
 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx      |    2 
 xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx            |    4 -
 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx          |    2 
 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx          |    4 -
 xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx       |    4 -
 xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx             |   10 +--
 267 files changed, 667 insertions(+), 667 deletions(-)

New commits:
commit 794120f5c62c80eba810a08d089ed5321b993579
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:28:31 2017 +0200

    loplugin:includeform: bean (Windows)
    
    Change-Id: Id35caf31499a437cba9ed3329920c560705be0cf

diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
index b1b476356fd5..d425d5e065e8 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -31,7 +31,7 @@
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #endif
-#include "jawt_md.h"
+#include <jawt_md.h>
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
commit 6fa4f9b848eeb85747e894c2704054b6d21a1693
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:28:23 2017 +0200

    loplugin:includeform: bridges (Windows)
    
    Change-Id: I4514d751d5449902c589c7f3577c7f3cd593d2e9

diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
index 864f80d7a615..36efe8e17289 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
@@ -25,10 +25,10 @@
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
-#include "bridge.hxx"
-#include "cppinterfaceproxy.hxx"
-#include "types.hxx"
-#include "vtablefactory.hxx"
+#include <bridge.hxx>
+#include <cppinterfaceproxy.hxx>
+#include <types.hxx>
+#include <vtablefactory.hxx>
 
 #include "mscx.hxx"
 
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index b96d354f14cd..640455b8bab9 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -244,16 +244,16 @@ void
 #include <typeinfo.h>
 #include <signal.h>
 
-#include "rtl/alloc.h"
-#include "rtl/strbuf.hxx"
-#include "rtl/ustrbuf.hxx"
+#include <rtl/alloc.h>
+#include <rtl/strbuf.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <osl/mutex.hxx>
 
-#include "com/sun/star/uno/Any.hxx"
+#include <com/sun/star/uno/Any.hxx>
 #include <unordered_map>
 #include "mscx.hxx"
-#include "except.hxx"
+#include <except.hxx>
 
 #pragma pack(push, 8)
 
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx b/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx
index 393e50b818ed..b51f6b7e4bcc 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx
@@ -24,7 +24,7 @@
 #include <windows.h>
 #pragma warning(pop)
 
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 
 
 class type_info;
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
index 2a6bcb8733dd..524228ad3bc4 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
@@ -26,10 +26,10 @@
 #include <com/sun/star/uno/genfunc.hxx>
 #include <uno/data.h>
 
-#include "bridge.hxx"
-#include "types.hxx"
-#include "unointerfaceproxy.hxx"
-#include "vtables.hxx"
+#include <bridge.hxx>
+#include <types.hxx>
+#include <unointerfaceproxy.hxx>
+#include <vtables.hxx>
 
 #include "mscx.hxx"
 
commit 5c778e44b21f9f244435b9e328fa1e8cb4459315
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:28:15 2017 +0200

    loplugin:includeform: canvas (Windows)
    
    Change-Id: I67e4e72ea58f64c4c12e977a936fe1e8e4578160

diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx
index 1214c99c71cd..2fd657fda3fe 100644
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -27,7 +27,7 @@
 
 
 #define WIN32_LEAN_AND_MEAN
-#include "prewin.h"
+#include <prewin.h>
 
 // Enabling Direct3D Debug Information Further more, with registry key
 // \\HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Direct3D\D3D9Debugging\\EnableCreationStack
@@ -154,7 +154,7 @@ namespace dxcanvas
 }
 
 
-#include "postwin.h"
+#include <postwin.h>
 
 #endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_WINSTUFF_HXX
 
commit f3bb12dbf3ab478627baaa14fb42eaa5a438b6ad
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:28:08 2017 +0200

    loplugin:includeform: chart2 (Windows)
    
    Change-Id: Ie3e8e174f3fa51331988481ec16d2d1a52bb9ece

diff --git a/chart2/qa/extras/xshape/chart2xshape.cxx b/chart2/qa/extras/xshape/chart2xshape.cxx
index d3708adedd7e..8021990e0be3 100644
--- a/chart2/qa/extras/xshape/chart2xshape.cxx
+++ b/chart2/qa/extras/xshape/chart2xshape.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "charttest.hxx"
+#include <charttest.hxx>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/chart2/CurveStyle.hpp>
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
commit 2739257380072645165f31a23365078df8659d48
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:27:55 2017 +0200

    loplugin:includeform: connectivity (Windows)
    
    Change-Id: I27b865cbb79c9ed9c1b5af9f0666450778ae8335

diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx
index 1eee379f800e..27e6acea428e 100644
--- a/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/connectivity/source/drivers/ado/ACallableStatement.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/ACallableStatement.hxx"
+#include <ado/ACallableStatement.hxx>
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/queryinterface.hxx>
 
diff --git a/connectivity/source/drivers/ado/ACatalog.cxx b/connectivity/source/drivers/ado/ACatalog.cxx
index 217b4824e696..3add7decb16e 100644
--- a/connectivity/source/drivers/ado/ACatalog.cxx
+++ b/connectivity/source/drivers/ado/ACatalog.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/ACatalog.hxx"
-#include "ado/AConnection.hxx"
-#include "ado/AGroups.hxx"
-#include "ado/AUsers.hxx"
-#include "ado/ATables.hxx"
-#include "ado/AViews.hxx"
+#include <ado/ACatalog.hxx>
+#include <ado/AConnection.hxx>
+#include <ado/AGroups.hxx>
+#include <ado/AUsers.hxx>
+#include <ado/ATables.hxx>
+#include <ado/AViews.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index 34c8b6129180..12b671ef115d 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/AColumn.hxx"
-#include "ado/AConnection.hxx"
-#include "ado/Awrapado.hxx"
+#include <ado/AColumn.hxx>
+#include <ado/AConnection.hxx>
+#include <ado/Awrapado.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <comphelper/extract.hxx>
 #include <comphelper/types.hxx>
-#include "ado/ACatalog.hxx"
+#include <ado/ACatalog.hxx>
 
 using namespace ::comphelper;
 
diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx
index 0361972e48a1..e72681b8d41f 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/AColumns.hxx"
-#include "ado/AColumn.hxx"
-#include "ado/AConnection.hxx"
-#include "ado/Awrapado.hxx"
+#include <ado/AColumns.hxx>
+#include <ado/AColumn.hxx>
+#include <ado/AConnection.hxx>
+#include <ado/Awrapado.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
@@ -29,7 +29,7 @@
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
 #include <algorithm>
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace connectivity::ado;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index aafb81d39368..7b98f77b147f 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/AConnection.hxx"
-#include "ado/ADatabaseMetaData.hxx"
-#include "ado/ADriver.hxx"
-#include "ado/AStatement.hxx"
-#include "ado/ACallableStatement.hxx"
-#include "ado/APreparedStatement.hxx"
-#include "ado/ACatalog.hxx"
+#include <ado/AConnection.hxx>
+#include <ado/ADatabaseMetaData.hxx>
+#include <ado/ADriver.hxx>
+#include <ado/AStatement.hxx>
+#include <ado/ACallableStatement.hxx>
+#include <ado/APreparedStatement.hxx>
+#include <ado/ACatalog.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/TransactionIsolation.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
@@ -31,7 +31,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <connectivity/dbexception.hxx>
 #include <osl/file.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace dbtools;
 using namespace connectivity::ado;
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
index e5f55eabd673..29871b110f13 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/ADatabaseMetaData.hxx"
-#include "ado/ADatabaseMetaDataResultSet.hxx"
+#include <ado/ADatabaseMetaData.hxx>
+#include <ado/ADatabaseMetaDataResultSet.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ResultSetType.hpp>
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
 #include <com/sun/star/sdbc/TransactionIsolation.hpp>
-#include "ado/AConnection.hxx"
-#include "ado/adoimp.hxx"
-#include "FDatabaseMetaDataResultSet.hxx"
+#include <ado/AConnection.hxx>
+#include <ado/adoimp.hxx>
+#include <FDatabaseMetaDataResultSet.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
 
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index e159863abb64..6a066f680348 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/ADatabaseMetaData.hxx"
-#include "ado/ADatabaseMetaDataResultSetMetaData.hxx"
-#include "ado/Awrapado.hxx"
-#include "ado/AGroup.hxx"
-#include "ado/adoimp.hxx"
-#include "ado/AIndex.hxx"
-#include "ado/AKey.hxx"
-#include "ado/ATable.hxx"
+#include <ado/ADatabaseMetaData.hxx>
+#include <ado/ADatabaseMetaDataResultSetMetaData.hxx>
+#include <ado/Awrapado.hxx>
+#include <ado/AGroup.hxx>
+#include <ado/adoimp.hxx>
+#include <ado/AIndex.hxx>
+#include <ado/AKey.hxx>
+#include <ado/ATable.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ProcedureResult.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index fa7657095050..fa820e900645 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <comphelper/sequence.hxx>
-#include "ado/ADatabaseMetaDataResultSet.hxx"
-#include "ado/ADatabaseMetaDataResultSetMetaData.hxx"
+#include <ado/ADatabaseMetaDataResultSet.hxx>
+#include <ado/ADatabaseMetaDataResultSetMetaData.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/KeyRule.hpp>
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
index 9a035e298993..9a4365abfcce 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/ADatabaseMetaDataResultSetMetaData.hxx"
-#include "ado/Awrapado.hxx"
+#include <ado/ADatabaseMetaDataResultSetMetaData.hxx>
+#include <ado/Awrapado.hxx>
 #include <connectivity/dbexception.hxx>
 
 
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index 741dc13878da..eda24fef3855 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -17,19 +17,19 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/ADriver.hxx"
-#include "ado/AConnection.hxx"
-#include "ado/Awrapadox.hxx"
-#include "ado/ACatalog.hxx"
-#include "ado/Awrapado.hxx"
-#include "ado/adoimp.hxx"
+#include <ado/ADriver.hxx>
+#include <ado/AConnection.hxx>
+#include <ado/Awrapadox.hxx>
+#include <ado/ACatalog.hxx>
+#include <ado/Awrapado.hxx>
+#include <ado/adoimp.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 #include <objbase.h>
 
-#include "resource/sharedresources.hxx"
+#include <resource/sharedresources.hxx>
 
 #include <memory>
 
diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx
index 274402b61744..230bac43ac52 100644
--- a/connectivity/source/drivers/ado/AGroup.cxx
+++ b/connectivity/source/drivers/ado/AGroup.cxx
@@ -18,14 +18,14 @@
  */
 
 
-#include "ado/AGroup.hxx"
-#include "ado/AUsers.hxx"
+#include <ado/AGroup.hxx>
+#include <ado/AUsers.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
-#include "ado/AConnection.hxx"
-#include "TConnection.hxx"
+#include <ado/AConnection.hxx>
+#include <TConnection.hxx>
 
 using namespace connectivity::ado;
 using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx
index 3b5df3c5e486..80d23e20f9dc 100644
--- a/connectivity/source/drivers/ado/AGroups.cxx
+++ b/connectivity/source/drivers/ado/AGroups.cxx
@@ -17,17 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/AGroups.hxx"
-#include "ado/AGroup.hxx"
-#include "ado/ATable.hxx"
-#include "ado/AConnection.hxx"
+#include <ado/AGroups.hxx>
+#include <ado/AGroup.hxx>
+#include <ado/ATable.hxx>
+#include <ado/AConnection.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <connectivity/sdbcx/IRefreshable.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx
index 3f5cffc26487..e4052431264e 100644
--- a/connectivity/source/drivers/ado/AIndex.cxx
+++ b/connectivity/source/drivers/ado/AIndex.cxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/AIndex.hxx"
+#include <ado/AIndex.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/sequence.hxx>
-#include "ado/AColumns.hxx"
+#include <ado/AColumns.hxx>
 #include <comphelper/extract.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <comphelper/types.hxx>
 
 using namespace ::comphelper;
diff --git a/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx
index 732c0a0b4ffe..a54887d2832e 100644
--- a/connectivity/source/drivers/ado/AIndexes.cxx
+++ b/connectivity/source/drivers/ado/AIndexes.cxx
@@ -17,16 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/AIndexes.hxx"
-#include "ado/AIndex.hxx"
-#include "ado/AConnection.hxx"
+#include <ado/AIndexes.hxx>
+#include <ado/AIndex.hxx>
+#include <ado/AConnection.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/IndexType.hpp>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace ::comphelper;
 
diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx
index d5686893f184..431955ce1b3a 100644
--- a/connectivity/source/drivers/ado/AKey.cxx
+++ b/connectivity/source/drivers/ado/AKey.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/AKey.hxx"
+#include <ado/AKey.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/sequence.hxx>
-#include "ado/AColumns.hxx"
-#include "ado/AConnection.hxx"
+#include <ado/AColumns.hxx>
+#include <ado/AConnection.hxx>
 
 using namespace connectivity::ado;
 using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx
index e12e7379c66f..e96b2dd9b031 100644
--- a/connectivity/source/drivers/ado/AKeys.cxx
+++ b/connectivity/source/drivers/ado/AKeys.cxx
@@ -17,18 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/AKeys.hxx"
-#include "ado/AKey.hxx"
+#include <ado/AKeys.hxx>
+#include <ado/AKey.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbcx/KeyType.hpp>
 #include <com/sun/star/sdbc/KeyRule.hpp>
-#include "ado/AConnection.hxx"
+#include <ado/AConnection.hxx>
 #include <comphelper/types.hxx>
-#include "ado/Awrapado.hxx"
+#include <ado/Awrapado.hxx>
 #include <comphelper/property.hxx>
 #include <connectivity/dbexception.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace ::comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 00aa9b072519..d15acf57b460 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -18,11 +18,11 @@
  */
 
 #include <connectivity/sqlparse.hxx>
-#include "ado/APreparedStatement.hxx"
+#include <ado/APreparedStatement.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
-#include "ado/AResultSetMetaData.hxx"
-#include "ado/AResultSet.hxx"
-#include "ado/ADriver.hxx"
+#include <ado/AResultSetMetaData.hxx>
+#include <ado/AResultSet.hxx>
+#include <ado/ADriver.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/queryinterface.hxx>
@@ -30,7 +30,7 @@
 #include <comphelper/sequence.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 
 #include <limits>
 
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 17c6f25810c4..2d6c1ece45e8 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/AResultSet.hxx"
-#include "ado/AResultSetMetaData.hxx"
+#include <ado/AResultSet.hxx>
+#include <ado/AResultSetMetaData.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/KeyRule.hpp>
 #include <com/sun/star/sdbc/IndexType.hpp>
diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx
index 37e7b2d2e3b2..23983342ebc5 100644
--- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx
+++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/AResultSetMetaData.hxx"
+#include <ado/AResultSetMetaData.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
-#include "ado/Awrapado.hxx"
+#include <ado/Awrapado.hxx>
 #include <connectivity/dbexception.hxx>
 
 using namespace connectivity;
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index 727902407b0f..8ffaad54f340 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/AStatement.hxx"
-#include "ado/AConnection.hxx"
-#include "ado/AResultSet.hxx"
+#include <ado/AStatement.hxx>
+#include <ado/AConnection.hxx>
+#include <ado/AResultSet.hxx>
 #include <comphelper/property.hxx>
 #include <osl/thread.h>
 #include <cppuhelper/typeprovider.hxx>
diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx
index dd84f1f67753..8c615e0acf08 100644
--- a/connectivity/source/drivers/ado/ATable.cxx
+++ b/connectivity/source/drivers/ado/ATable.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/ATable.hxx"
-#include "ado/AIndexes.hxx"
-#include "ado/AColumns.hxx"
-#include "ado/AColumn.hxx"
-#include "ado/AKeys.hxx"
-#include "ado/AConnection.hxx"
+#include <ado/ATable.hxx>
+#include <ado/AIndexes.hxx>
+#include <ado/AColumns.hxx>
+#include <ado/AColumn.hxx>
+#include <ado/AKeys.hxx>
+#include <ado/AConnection.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbcx/KeyType.hpp>
@@ -30,9 +30,9 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
-#include "ado/Awrapado.hxx"
+#include <ado/Awrapado.hxx>
 #include <comphelper/sequence.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <comphelper/types.hxx>
 
 using namespace ::comphelper;
diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx
index 0c848f21de78..95c06f39c6f8 100644
--- a/connectivity/source/drivers/ado/ATables.cxx
+++ b/connectivity/source/drivers/ado/ATables.cxx
@@ -17,21 +17,21 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/ATables.hxx"
-#include "ado/ATable.hxx"
+#include <ado/ATables.hxx>
+#include <ado/ATable.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/KeyRule.hpp>
 #include <com/sun/star/sdbcx/KeyType.hpp>
-#include "ado/ACatalog.hxx"
-#include "ado/AConnection.hxx"
-#include "ado/Awrapado.hxx"
-#include "TConnection.hxx"
+#include <ado/ACatalog.hxx>
+#include <ado/AConnection.hxx>
+#include <ado/Awrapado.hxx>
+#include <TConnection.hxx>
 #include <comphelper/types.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <connectivity/dbexception.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace ::cppu;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx
index ded62ae2840c..89c6d63b61f6 100644
--- a/connectivity/source/drivers/ado/AUser.cxx
+++ b/connectivity/source/drivers/ado/AUser.cxx
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/AUser.hxx"
-#include "ado/ACatalog.hxx"
-#include "ado/AGroups.hxx"
+#include <ado/AUser.hxx>
+#include <ado/ACatalog.hxx>
+#include <ado/AGroups.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
-#include "ado/AConnection.hxx"
-#include "ado/Awrapado.hxx"
+#include <ado/AConnection.hxx>
+#include <ado/Awrapado.hxx>
 
 using namespace connectivity::ado;
 using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx
index d9948573a426..48075d5960c4 100644
--- a/connectivity/source/drivers/ado/AUsers.cxx
+++ b/connectivity/source/drivers/ado/AUsers.cxx
@@ -17,16 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/AUsers.hxx"
-#include "ado/AUser.hxx"
-#include "ado/ATable.hxx"
-#include "ado/AConnection.hxx"
+#include <ado/AUsers.hxx>
+#include <ado/AUser.hxx>
+#include <ado/ATable.hxx>
+#include <ado/AConnection.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <connectivity/sdbcx/IRefreshable.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx
index 05c835b86e10..4b70bf767ddc 100644
--- a/connectivity/source/drivers/ado/AView.cxx
+++ b/connectivity/source/drivers/ado/AView.cxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/AView.hxx"
+#include <ado/AView.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
-#include "ado/adoimp.hxx"
+#include <ado/adoimp.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include "ado/Awrapado.hxx"
+#include <ado/Awrapado.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/types.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 
 using namespace comphelper;
diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx
index a67e072cc30b..7f6ccb0f3c15 100644
--- a/connectivity/source/drivers/ado/AViews.cxx
+++ b/connectivity/source/drivers/ado/AViews.cxx
@@ -17,16 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/AViews.hxx"
-#include "ado/AView.hxx"
-#include "ado/ATables.hxx"
-#include "ado/ACatalog.hxx"
-#include "ado/AConnection.hxx"
-#include "ado/Awrapado.hxx"
-#include "TConnection.hxx"
+#include <ado/AViews.hxx>
+#include <ado/AView.hxx>
+#include <ado/ATables.hxx>
+#include <ado/ACatalog.hxx>
+#include <ado/AConnection.hxx>
+#include <ado/Awrapado.hxx>
+#include <TConnection.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace ::comphelper;
 
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx
index 09c0b2dc723e..bc8c9236a623 100644
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/Aolevariant.hxx"
+#include <ado/Aolevariant.hxx>
 #include <connectivity/dbconversion.hxx>
 #include <osl/diagnose.h>
 #include <o3tl/char16_t2wchar_t.hxx>
@@ -25,8 +25,8 @@
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/DateTime.hpp>
-#include "resource/sharedresources.hxx"
-#include "strings.hrc"
+#include <resource/sharedresources.hxx>
+#include <strings.hrc>
 #include <com/sun/star/bridge/oleautomation/Date.hpp>
 #include <com/sun/star/bridge/oleautomation/Currency.hpp>
 #include <com/sun/star/bridge/oleautomation/SCode.hpp>
diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx
index b8e13c96cd3d..d9617ab0d460 100644
--- a/connectivity/source/drivers/ado/Aservices.cxx
+++ b/connectivity/source/drivers/ado/Aservices.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ado/ADriver.hxx"
+#include <ado/ADriver.hxx>
 #include <cppuhelper/factory.hxx>
 
 using namespace connectivity::ado;
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx
index 4a71534c01fb..4a1934b44b00 100644
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <sal/macros.h>
-#include "ado/Awrapado.hxx"
-#include "ado/Awrapadox.hxx"
+#include <ado/Awrapado.hxx>
+#include <ado/Awrapadox.hxx>
 #include <comphelper/types.hxx>
 #include <rtl/ustrbuf.hxx>
 
diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx
index f7e2667b3cdb..1e368d8ddec9 100644
--- a/connectivity/source/drivers/ado/adoimp.cxx
+++ b/connectivity/source/drivers/ado/adoimp.cxx
@@ -20,8 +20,8 @@
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/sdbcx/PrivilegeObject.hpp>
 #include <connectivity/dbexception.hxx>
-#include "ado/Awrapado.hxx"
-#include "ado/adoimp.hxx"
+#include <ado/Awrapado.hxx>
+#include <ado/adoimp.hxx>
 #include <osl/diagnose.h>
 #include <com/sun/star/sdbc/DataType.hpp>
 
diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx b/connectivity/source/inc/ado/ACallableStatement.hxx
index 54b04a7db711..6d6979e40f35 100644
--- a/connectivity/source/inc/ado/ACallableStatement.hxx
+++ b/connectivity/source/inc/ado/ACallableStatement.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ACALLABLESTATEMENT_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ACALLABLESTATEMENT_HXX
 
-#include "ado/APreparedStatement.hxx"
+#include <ado/APreparedStatement.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XOutParameters.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/connectivity/source/inc/ado/ACatalog.hxx b/connectivity/source/inc/ado/ACatalog.hxx
index 7475e66f8a5c..b3a794800d55 100644
--- a/connectivity/source/inc/ado/ACatalog.hxx
+++ b/connectivity/source/inc/ado/ACatalog.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ACATALOG_HXX
 
 #include <connectivity/sdbcx/VCatalog.hxx>
-#include "ado/Awrapadox.hxx"
+#include <ado/Awrapadox.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/AColumn.hxx b/connectivity/source/inc/ado/AColumn.hxx
index 4bb75b9ebf29..d4a4cb1b9e68 100644
--- a/connectivity/source/inc/ado/AColumn.hxx
+++ b/connectivity/source/inc/ado/AColumn.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ACOLUMN_HXX
 
 #include <connectivity/sdbcx/VColumn.hxx>
-#include "ado/Awrapadox.hxx"
+#include <ado/Awrapadox.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/AColumns.hxx b/connectivity/source/inc/ado/AColumns.hxx
index aac1d97a15fa..44d481f5dcb8 100644
--- a/connectivity/source/inc/ado/AColumns.hxx
+++ b/connectivity/source/inc/ado/AColumns.hxx
@@ -23,7 +23,7 @@
 #include <connectivity/sdbcx/VCollection.hxx>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <connectivity/sdbcx/IRefreshable.hxx>
-#include "ado/Awrapadox.hxx"
+#include <ado/Awrapadox.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx
index 23fb72f53e82..d546ab8ef154 100644
--- a/connectivity/source/inc/ado/AConnection.hxx
+++ b/connectivity/source/inc/ado/AConnection.hxx
@@ -25,9 +25,9 @@
 #include <connectivity/OSubComponent.hxx>
 #include <map>
 #include <connectivity/CommonTools.hxx>
-#include "OTypeInfo.hxx"
-#include "TConnection.hxx"
-#include "ado/Awrapado.hxx"
+#include <OTypeInfo.hxx>
+#include <TConnection.hxx>
+#include <ado/Awrapado.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/ADatabaseMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
index 9acb10561e8b..83a84f3bda03 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ADATABASEMETADATA_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ADATABASEMETADATA_HXX
 
-#include "TDatabaseMetaDataBase.hxx"
+#include <TDatabaseMetaDataBase.hxx>
 #include <map>
 
 namespace connectivity
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
index 8883600ee6d2..ea64856c0aca 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
@@ -32,7 +32,7 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/proparrhlp.hxx>
-#include "ado/AStatement.hxx"
+#include <ado/AStatement.hxx>
 #include <connectivity/StdTypeDefs.hxx>
 
 namespace connectivity
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
index a69ed9a8b2d3..714aa91367bd 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
@@ -23,9 +23,9 @@
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <vector>
-#include "ado/Awrapado.hxx"
-#include "ado/ADatabaseMetaDataResultSet.hxx"
-#include "OColumn.hxx"
+#include <ado/Awrapado.hxx>
+#include <ado/ADatabaseMetaDataResultSet.hxx>
+#include <OColumn.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/AGroup.hxx b/connectivity/source/inc/ado/AGroup.hxx
index ae3a5dd60584..79c067d4462e 100644
--- a/connectivity/source/inc/ado/AGroup.hxx
+++ b/connectivity/source/inc/ado/AGroup.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AGROUP_HXX
 
 #include <connectivity/sdbcx/VGroup.hxx>
-#include "ado/Awrapadox.hxx"
+#include <ado/Awrapadox.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/AGroups.hxx b/connectivity/source/inc/ado/AGroups.hxx
index 42e5120d0edc..24f99aba49ab 100644
--- a/connectivity/source/inc/ado/AGroups.hxx
+++ b/connectivity/source/inc/ado/AGroups.hxx
@@ -21,8 +21,8 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AGROUPS_HXX
 
 #include <connectivity/sdbcx/VCollection.hxx>
-#include "ado/Awrapadox.hxx"
-#include "ado/ACatalog.hxx"
+#include <ado/Awrapadox.hxx>
+#include <ado/ACatalog.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/AIndex.hxx b/connectivity/source/inc/ado/AIndex.hxx
index ad9d26b056b0..eb5790173aa6 100644
--- a/connectivity/source/inc/ado/AIndex.hxx
+++ b/connectivity/source/inc/ado/AIndex.hxx
@@ -22,7 +22,7 @@
 
 #include <connectivity/sdbcx/VIndex.hxx>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include "ado/Awrapadox.hxx"
+#include <ado/Awrapadox.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/AIndexes.hxx b/connectivity/source/inc/ado/AIndexes.hxx
index 7c2190b2b054..0d427d294501 100644
--- a/connectivity/source/inc/ado/AIndexes.hxx
+++ b/connectivity/source/inc/ado/AIndexes.hxx
@@ -21,7 +21,7 @@
 
 #include <connectivity/sdbcx/VCollection.hxx>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include "ado/Awrapadox.hxx"
+#include <ado/Awrapadox.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/AKey.hxx b/connectivity/source/inc/ado/AKey.hxx
index 8f01928800f6..2c4acba3fd73 100644
--- a/connectivity/source/inc/ado/AKey.hxx
+++ b/connectivity/source/inc/ado/AKey.hxx
@@ -22,7 +22,7 @@
 
 #include <connectivity/sdbcx/VKey.hxx>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include "ado/Awrapadox.hxx"
+#include <ado/Awrapadox.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/AKeys.hxx b/connectivity/source/inc/ado/AKeys.hxx
index d26da4fbc8f0..db904ef5b98c 100644
--- a/connectivity/source/inc/ado/AKeys.hxx
+++ b/connectivity/source/inc/ado/AKeys.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AKEYS_HXX
 
 #include <connectivity/sdbcx/VCollection.hxx>
-#include "ado/Awrapadox.hxx"
+#include <ado/Awrapadox.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx b/connectivity/source/inc/ado/APreparedStatement.hxx
index 818d149c1ad1..214f277c16bf 100644
--- a/connectivity/source/inc/ado/APreparedStatement.hxx
+++ b/connectivity/source/inc/ado/APreparedStatement.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_APREPAREDSTATEMENT_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_APREPAREDSTATEMENT_HXX
 
-#include "ado/AStatement.hxx"
+#include <ado/AStatement.hxx>
 #include <com/sun/star/sdbc/XPreparedStatement.hpp>
 #include <com/sun/star/sdbc/XParameters.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx
index 52043a875902..f901553332e0 100644
--- a/connectivity/source/inc/ado/AResultSet.hxx
+++ b/connectivity/source/inc/ado/AResultSet.hxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/sdbc/XRowUpdate.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/proparrhlp.hxx>
-#include "ado/AStatement.hxx"
+#include <ado/AStatement.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
diff --git a/connectivity/source/inc/ado/AResultSetMetaData.hxx b/connectivity/source/inc/ado/AResultSetMetaData.hxx
index bb9d44446653..ebb52be02e2b 100644
--- a/connectivity/source/inc/ado/AResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/AResultSetMetaData.hxx
@@ -23,9 +23,9 @@
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <vector>
-#include "ado/Awrapado.hxx"
-#include "ado/AResultSet.hxx"
-#include "OColumn.hxx"
+#include <ado/Awrapado.hxx>
+#include <ado/AResultSet.hxx>
+#include <OColumn.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx
index 495578694ea4..3212f8220868 100644
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
@@ -31,9 +31,9 @@
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <comphelper/uno3.hxx>
-#include "ado/AConnection.hxx"
+#include <ado/AConnection.hxx>
 #include <vector>
-#include "ado/Awrapado.hxx"
+#include <ado/Awrapado.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 namespace connectivity
diff --git a/connectivity/source/inc/ado/ATable.hxx b/connectivity/source/inc/ado/ATable.hxx
index 869c14cacd7e..4e569f6561b3 100644
--- a/connectivity/source/inc/ado/ATable.hxx
+++ b/connectivity/source/inc/ado/ATable.hxx
@@ -21,8 +21,8 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ATABLE_HXX
 
 #include <connectivity/sdbcx/VTable.hxx>
-#include "ado/Awrapadox.hxx"
-#include "ado/ACatalog.hxx"
+#include <ado/Awrapadox.hxx>
+#include <ado/ACatalog.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/ATables.hxx b/connectivity/source/inc/ado/ATables.hxx
index 28203af3fce3..e3f262d0d632 100644
--- a/connectivity/source/inc/ado/ATables.hxx
+++ b/connectivity/source/inc/ado/ATables.hxx
@@ -20,8 +20,8 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ATABLES_HXX
 
 #include <connectivity/sdbcx/VCollection.hxx>
-#include "ado/Awrapadox.hxx"
-#include "ado/ACatalog.hxx"
+#include <ado/Awrapadox.hxx>
+#include <ado/ACatalog.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/AUser.hxx b/connectivity/source/inc/ado/AUser.hxx
index da92fc245414..a3f2c97e7fd9 100644
--- a/connectivity/source/inc/ado/AUser.hxx
+++ b/connectivity/source/inc/ado/AUser.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AUSER_HXX
 
 #include <connectivity/sdbcx/VUser.hxx>
-#include "ado/Awrapadox.hxx"
+#include <ado/Awrapadox.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/AUsers.hxx b/connectivity/source/inc/ado/AUsers.hxx
index d810cffb9f4f..a5e0c96f924f 100644
--- a/connectivity/source/inc/ado/AUsers.hxx
+++ b/connectivity/source/inc/ado/AUsers.hxx
@@ -21,8 +21,8 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AUSERS_HXX
 
 #include <connectivity/sdbcx/VCollection.hxx>
-#include "ado/Awrapadox.hxx"
-#include "ado/ACatalog.hxx"
+#include <ado/Awrapadox.hxx>
+#include <ado/ACatalog.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/AView.hxx b/connectivity/source/inc/ado/AView.hxx
index 628fac387c5c..43ad6a9a3cf2 100644
--- a/connectivity/source/inc/ado/AView.hxx
+++ b/connectivity/source/inc/ado/AView.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AVIEW_HXX
 
 #include <connectivity/sdbcx/VView.hxx>
-#include "ado/Awrapadox.hxx"
+#include <ado/Awrapadox.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/AViews.hxx b/connectivity/source/inc/ado/AViews.hxx
index 2e0b3379a308..44078b366481 100644
--- a/connectivity/source/inc/ado/AViews.hxx
+++ b/connectivity/source/inc/ado/AViews.hxx
@@ -21,8 +21,8 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AVIEWS_HXX
 
 #include <connectivity/sdbcx/VCollection.hxx>
-#include "ado/Awrapadox.hxx"
-#include "ado/ACatalog.hxx"
+#include <ado/Awrapadox.hxx>
+#include <ado/ACatalog.hxx>
 
 
 namespace connectivity
diff --git a/connectivity/source/inc/ado/Aolevariant.hxx b/connectivity/source/inc/ado/Aolevariant.hxx
index f531848aa9b9..37c0725b02c7 100644
--- a/connectivity/source/inc/ado/Aolevariant.hxx
+++ b/connectivity/source/inc/ado/Aolevariant.hxx
@@ -23,9 +23,9 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include "ado_pre_sys_include.h"
+#include <ado_pre_sys_include.h>
 #include <oaidl.h>
-#include "ado_post_sys_include.h"
+#include <ado_post_sys_include.h>
 
 namespace com
 {
diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx
index b40ad4bd1be9..e12239791149 100644
--- a/connectivity/source/inc/ado/Awrapado.hxx
+++ b/connectivity/source/inc/ado/Awrapado.hxx
@@ -22,14 +22,14 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
 // Includes for ADO
-#include "ado_pre_sys_include.h"
+#include <ado_pre_sys_include.h>
 #include <oledb.h>
 #include <ocidl.h>
 #include <adoint.h>
-#include "ado_post_sys_include.h"
-#include "ado/adoimp.hxx"
-#include "ado/Aolewrap.hxx"
-#include "ado/Aolevariant.hxx"
+#include <ado_post_sys_include.h>
+#include <ado/adoimp.hxx>
+#include <ado/Aolewrap.hxx>
+#include <ado/Aolevariant.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/Awrapadox.hxx b/connectivity/source/inc/ado/Awrapadox.hxx
index 56acb92785f4..3b3c8583371f 100644
--- a/connectivity/source/inc/ado/Awrapadox.hxx
+++ b/connectivity/source/inc/ado/Awrapadox.hxx
@@ -53,21 +53,21 @@ typedef struct _ADOTable Table;
 #endif
 
 
-#include "ado_pre_sys_include.h"
+#include <ado_pre_sys_include.h>
 #include <adoint.h>
 #include <adoctint.h>
-#include "ado_post_sys_include.h"
-
-
-#include "ado/Aolewrap.hxx"
-#include "ado/Aolevariant.hxx"
-#include "ado/adoimp.hxx"
-#include "ado/Awrapado.hxx"
-#include "ado/WrapColumn.hxx"
-#include "ado/WrapIndex.hxx"
-#include "ado/WrapKey.hxx"
-#include "ado/WrapTable.hxx"
-#include "ado/WrapCatalog.hxx"
+#include <ado_post_sys_include.h>
+
+
+#include <ado/Aolewrap.hxx>
+#include <ado/Aolevariant.hxx>
+#include <ado/adoimp.hxx>
+#include <ado/Awrapado.hxx>
+#include <ado/WrapColumn.hxx>
+#include <ado/WrapIndex.hxx>
+#include <ado/WrapKey.hxx>
+#include <ado/WrapTable.hxx>
+#include <ado/WrapCatalog.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/WrapCatalog.hxx b/connectivity/source/inc/ado/WrapCatalog.hxx
index 2e90ac93d89d..3587d5bcd34a 100644
--- a/connectivity/source/inc/ado/WrapCatalog.hxx
+++ b/connectivity/source/inc/ado/WrapCatalog.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_WRAPCATALOG_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_WRAPCATALOG_HXX
 
-#include "ado/WrapTypeDefs.hxx"
+#include <ado/WrapTypeDefs.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/WrapColumn.hxx b/connectivity/source/inc/ado/WrapColumn.hxx
index 64093d71d26f..9548c7890479 100644
--- a/connectivity/source/inc/ado/WrapColumn.hxx
+++ b/connectivity/source/inc/ado/WrapColumn.hxx
@@ -19,11 +19,11 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_WRAPCOLUMN_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_WRAPCOLUMN_HXX
 
-#include "ado/Aolewrap.hxx"
+#include <ado/Aolewrap.hxx>
 
-#include "ado_pre_sys_include.h"
+#include <ado_pre_sys_include.h>
 #include <adoint.h>
-#include "ado_post_sys_include.h"
+#include <ado_post_sys_include.h>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/WrapIndex.hxx b/connectivity/source/inc/ado/WrapIndex.hxx
index 23fd7b476c5b..e60a1249afc2 100644
--- a/connectivity/source/inc/ado/WrapIndex.hxx
+++ b/connectivity/source/inc/ado/WrapIndex.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_WRAPINDEX_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_WRAPINDEX_HXX
 
-#include "ado/WrapTypeDefs.hxx"
+#include <ado/WrapTypeDefs.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/WrapKey.hxx b/connectivity/source/inc/ado/WrapKey.hxx
index 774b5c43a5ea..e5e10a56c835 100644
--- a/connectivity/source/inc/ado/WrapKey.hxx
+++ b/connectivity/source/inc/ado/WrapKey.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_WRAPKEY_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_WRAPKEY_HXX
 
-#include "ado/WrapTypeDefs.hxx"
+#include <ado/WrapTypeDefs.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/WrapTable.hxx b/connectivity/source/inc/ado/WrapTable.hxx
index b8e1a9ab8711..b7a1be72eb30 100644
--- a/connectivity/source/inc/ado/WrapTable.hxx
+++ b/connectivity/source/inc/ado/WrapTable.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_WRAPTABLE_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_WRAPTABLE_HXX
 
-#include "ado/WrapTypeDefs.hxx"
+#include <ado/WrapTypeDefs.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/adoimp.hxx b/connectivity/source/inc/ado/adoimp.hxx
index 6a7f8d418136..1459d56f8bf7 100644
--- a/connectivity/source/inc/ado/adoimp.hxx
+++ b/connectivity/source/inc/ado/adoimp.hxx
@@ -21,9 +21,9 @@
 
 #include <com/sun/star/sdbc/SQLException.hpp>
 
-#include "ado_pre_sys_include.h"
+#include <ado_pre_sys_include.h>
 #include <adoctint.h>
-#include "ado_post_sys_include.h"
+#include <ado_post_sys_include.h>
 
 struct ADOConnection;
 namespace connectivity
commit 72b9861498be4e267d142efa64d93ab3df4c6f1f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:27:44 2017 +0200

    loplugin:includeform: dbaccess (Windows)
    
    Change-Id: I8ed4161f8f2552200d1ddc280c922d9077e63a87

diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx
index ef4bc2601b36..4e0db429b773 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.cxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.cxx
@@ -26,7 +26,7 @@
 // LO/windows.h conflict
 #undef WB_LEFT
 #undef WB_RIGHT
-#include "msdasc.h"
+#include <msdasc.h>
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #endif
diff --git a/dbaccess/source/ui/dlg/adodatalinks.hxx b/dbaccess/source/ui/dlg/adodatalinks.hxx
index 85182223d31e..f7eed5e85b9b 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.hxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_DLG_ADODATALINKS_HXX
 
 #include <osl/module.h>
-#include "commontypes.hxx"
+#include <commontypes.hxx>
 
 OUString getAdoDatalink(long hWnd,OUString const & oldLink);
 #endif
commit fa6d8eebd1574213670dbedc79441d1a1118cd86
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:27:29 2017 +0200

    loplugin:includeform: desktop (Windows)
    
    Change-Id: I245c58a3d97eb0d60e7063e9c34c77d33739801d

diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index 07b5672ef377..10c469902b34 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -30,9 +30,9 @@
 #if !defined WIN32_LEAN_AND_MEAN
 # define WIN32_LEAN_AND_MEAN
 #endif
-#include "windows.h"
-#include "io.h"
-#include "fcntl.h"
+#include <windows.h>
+#include <io.h>
+#include <fcntl.h>
 #endif
 
 namespace desktop
commit 9851245f1e5978c566acbc4db69ba650b455b1b4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:27:21 2017 +0200

    loplugin:includeform: dtrans (Windows)
    
    Change-Id: I8da9250a64d1be4fe410028676320f5bb38d0176

diff --git a/dtrans/source/generic/clipboardmanager.cxx b/dtrans/source/generic/clipboardmanager.cxx
index 89ce1dc15ecb..5921796d5946 100644
--- a/dtrans/source/generic/clipboardmanager.cxx
+++ b/dtrans/source/generic/clipboardmanager.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <clipboardmanager.hxx>
+#include "clipboardmanager.hxx"
 #include <com/sun/star/container/ElementExistException.hpp>
 #include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
diff --git a/dtrans/source/generic/dtrans.cxx b/dtrans/source/generic/dtrans.cxx
index 22be8aca3c22..86fe4f5d76bb 100644
--- a/dtrans/source/generic/dtrans.cxx
+++ b/dtrans/source/generic/dtrans.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <cppuhelper/factory.hxx>
-#include <clipboardmanager.hxx>
-#include <generic_clipboard.hxx>
+#include "clipboardmanager.hxx"
+#include "generic_clipboard.hxx"
 
 using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
diff --git a/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx
index c9477e068c7f..216bd578ebc4 100644
--- a/dtrans/source/generic/generic_clipboard.cxx
+++ b/dtrans/source/generic/generic_clipboard.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <generic_clipboard.hxx>
+#include "generic_clipboard.hxx"
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/datatransfer/clipboard/RenderingCapabilities.hpp>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index 311e3a2320b9..8a69a438ba6f 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -23,7 +23,7 @@
 
 #include "DOTransferable.hxx"
 #include "../misc/ImplHelper.hxx"
-#include "WinClip.hxx"
+#include <WinClip.hxx>
 #include "DTransHelper.hxx"
 #include "TxtCnvtHlp.hxx"
 #include "MimeAttrib.hxx"
diff --git a/dtrans/source/win32/dtobj/DTransHelper.hxx b/dtrans/source/win32/dtobj/DTransHelper.hxx
index 84d34e200db2..381756c27716 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.hxx
+++ b/dtrans/source/win32/dtobj/DTransHelper.hxx
@@ -31,7 +31,7 @@
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
-#include "WinClip.hxx"
+#include <WinClip.hxx>
 
 #define AUTO_INIT                 TRUE
 
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
index ddb0ee6d750f..04367b93b999 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
@@ -22,7 +22,7 @@
 #include <osl/diagnose.h>
 #include <rtl/tencinfo.h>
 #include "../misc/ImplHelper.hxx"
-#include "WinClip.hxx"
+#include <WinClip.hxx>
 #include "MimeAttrib.hxx"
 #include "DTransHelper.hxx"
 #include <rtl/string.h>
diff --git a/dtrans/source/win32/dtobj/FetcList.cxx b/dtrans/source/win32/dtobj/FetcList.cxx
index e26ceeac0072..98e6bffb14d0 100644
--- a/dtrans/source/win32/dtobj/FetcList.cxx
+++ b/dtrans/source/win32/dtobj/FetcList.cxx
@@ -26,7 +26,7 @@
 
 #include "DataFmtTransl.hxx"
 #include "../misc/ImplHelper.hxx"
-#include "WinClip.hxx"
+#include <WinClip.hxx>
 
 #include <algorithm>
 
diff --git a/dtrans/source/win32/ftransl/ftransl.hxx b/dtrans/source/win32/ftransl/ftransl.hxx
index c93cd8096d5d..71d8038d2b23 100644
--- a/dtrans/source/win32/ftransl/ftransl.hxx
+++ b/dtrans/source/win32/ftransl/ftransl.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/datatransfer/XDataFormatTranslator.hpp>
 #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include "WinClip.hxx"
+#include <WinClip.hxx>
 
 #include <vector>
 
commit 9f162a8220c0cdf94af28f3035f559d629d2a5a6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:27:08 2017 +0200

    loplugin:includeform: embeddedobj (Windows)
    
    Change-Id: I76ed24e2bed461fd25562cce3190a2da8aa7a95d

diff --git a/embeddedobj/source/msole/advisesink.cxx b/embeddedobj/source/msole/advisesink.cxx
index cea44757d3c7..2b899aa6b002 100644
--- a/embeddedobj/source/msole/advisesink.cxx
+++ b/embeddedobj/source/msole/advisesink.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <osl/diagnose.h>
-#include <advisesink.hxx>
-#include <olecomponent.hxx>
+#include "advisesink.hxx"
+#include "olecomponent.hxx"
 
 #include <rtl/ref.hxx>
 
diff --git a/embeddedobj/source/msole/advisesink.hxx b/embeddedobj/source/msole/advisesink.hxx
index cecdc171ddb5..1f43048959ec 100644
--- a/embeddedobj/source/msole/advisesink.hxx
+++ b/embeddedobj/source/msole/advisesink.hxx
@@ -22,7 +22,7 @@
 
 #include <osl/interlck.h>
 #include <osl/mutex.hxx>
-#include <platform.h>
+#include "platform.h"
 
 class OleComponent;
 class OleWrapperAdviseSink : public IAdviseSink
diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx
index 3223ccd09cf0..7905b786cef0 100644
--- a/embeddedobj/source/msole/graphconvert.cxx
+++ b/embeddedobj/source/msole/graphconvert.cxx
@@ -33,9 +33,9 @@
 #include <tools/stream.hxx>
 #include <vcl/graphicfilter.hxx>
 
-#include <graphconvert.hxx>
+#include "graphconvert.hxx"
 #include "mtnotification.hxx"
-#include "oleembobj.hxx"
+#include <oleembobj.hxx>
 
 
 using namespace ::com::sun::star;
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index c70c8b2a3fd1..1b7d171f5074 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -54,7 +54,7 @@
 #include "ownview.hxx"
 
 #if defined(_WIN32)
-#include <olecomponent.hxx>
+#include "olecomponent.hxx"
 #endif
 
 using namespace ::com::sun::star;
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index f6c0d0232027..ad348f468c98 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -36,7 +36,7 @@
 #include "ownview.hxx"
 
 #if defined(_WIN32)
-#include <olecomponent.hxx>
+#include "olecomponent.hxx"
 #endif
 
 using namespace ::com::sun::star;
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index 590a89b03533..44a9667c4240 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -50,7 +50,7 @@
 #include <closepreventer.hxx>
 
 #if defined(_WIN32)
-#include <olecomponent.hxx>
+#include "olecomponent.hxx"
 #endif
 
 using namespace ::com::sun::star;
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index 1fc8255275f8..a9faa3a83eeb 100644
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
@@ -32,7 +32,7 @@
 #include <filter/msfilter/classids.hxx>
 
 #if defined(_WIN32)
-#include <olecomponent.hxx>
+#include "olecomponent.hxx"
 #endif
 
 using namespace ::com::sun::star;
diff --git a/embeddedobj/source/msole/olewrapclient.hxx b/embeddedobj/source/msole/olewrapclient.hxx
index be64ab340586..ad8fe0cfa1f8 100644
--- a/embeddedobj/source/msole/olewrapclient.hxx
+++ b/embeddedobj/source/msole/olewrapclient.hxx
@@ -22,7 +22,7 @@
 
 #include <osl/interlck.h>
 #include <osl/mutex.hxx>
-#include <platform.h>
+#include "platform.h"
 
 class OleComponent;
 class OleWrapperClientSite : public IOleClientSite
diff --git a/embeddedobj/source/msole/platform.h b/embeddedobj/source/msole/platform.h
index 8e5faeecf546..59557a7cf5c0 100644
--- a/embeddedobj/source/msole/platform.h
+++ b/embeddedobj/source/msole/platform.h
@@ -31,7 +31,7 @@
 #if !defined WIN32_LEAN_AND_MEAN
 # define WIN32_LEAN_AND_MEAN
 #endif
-#include "windows.h"
+#include <windows.h>
 #include <ole2.h>
 
 #if defined _MSC_VER
diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx
index f701268464d6..bcf02a0972f3 100644
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/embeddedobj/source/msole/xdialogcreator.cxx
@@ -36,7 +36,7 @@
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
-#include <xdialogcreator.hxx>
+#include "xdialogcreator.hxx"
 #include <oleembobj.hxx>
 
 
commit 3cfacaee068e782a1288c9c17b478135e128f469
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:27:00 2017 +0200

    loplugin:includeform: embedserv (Windows)
    
    Change-Id: I98bd95a46e645cf61f81d66faa1f700675e538bd

diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index c596af732f93..731c453c9cf0 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -20,12 +20,12 @@
 #pragma warning(disable : 4917 4555)
 #endif
 
-#include "docholder.hxx"
-#include "embeddoc.hxx"
-#include "intercept.hxx"
-#include "syswinwrapper.hxx"
-#include "iipaobj.hxx"
-#include "common.h"
+#include <docholder.hxx>
+#include <embeddoc.hxx>
+#include <intercept.hxx>
+#include <syswinwrapper.hxx>
+#include <iipaobj.hxx>
+#include <common.h>
 
 #if !defined WIN32_LEAN_AND_MEAN
 # define WIN32_LEAN_AND_MEAN
diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx
index fe37ad43ddd6..c05e9d2def12 100644
--- a/embedserv/source/embed/ed_idataobj.cxx
+++ b/embedserv/source/embed/ed_idataobj.cxx
@@ -20,7 +20,7 @@
 #pragma warning(disable : 4917 4555)
 #endif
 
-#include "embeddoc.hxx"
+#include <embeddoc.hxx>
 
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Exception.hpp>
diff --git a/embedserv/source/embed/ed_iinplace.cxx b/embedserv/source/embed/ed_iinplace.cxx
index d013fee3fd15..710ea722b6a0 100644
--- a/embedserv/source/embed/ed_iinplace.cxx
+++ b/embedserv/source/embed/ed_iinplace.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "embeddoc.hxx"
+#include <embeddoc.hxx>
 #include <osl/diagnose.h>
 
 
diff --git a/embedserv/source/embed/ed_ioleobject.cxx b/embedserv/source/embed/ed_ioleobject.cxx
index 140efc12fd3f..82a39b8b583a 100644
--- a/embedserv/source/embed/ed_ioleobject.cxx
+++ b/embedserv/source/embed/ed_ioleobject.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "embeddoc.hxx"
+#include <embeddoc.hxx>
 #include <osl/diagnose.h>
 #include <o3tl/char16_t2wchar_t.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx
index db14f3fb4893..3836d59b84d1 100644
--- a/embedserv/source/embed/ed_ipersiststr.cxx
+++ b/embedserv/source/embed/ed_ipersiststr.cxx
@@ -20,7 +20,7 @@
 #pragma warning(disable : 4917 4555)
 #endif
 
-#include "embeddoc.hxx"
+#include <embeddoc.hxx>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
@@ -42,7 +42,7 @@
 #include <osl/diagnose.h>
 #include <sal/types.h>
 
-#include <guid.hxx>
+#include "guid.hxx"
 
 #include <string.h>
 
diff --git a/embedserv/source/embed/esdll.cxx b/embedserv/source/embed/esdll.cxx
index ccf737053bba..d9b19510ff2c 100644
--- a/embedserv/source/embed/esdll.cxx
+++ b/embedserv/source/embed/esdll.cxx
@@ -22,7 +22,7 @@
 #pragma warning(disable : 4917 4555)
 #endif
 
-#include "stdafx.h"
+#include <stdafx.h>
 
 #include <atlbase.h>
 #ifdef _MSC_VER
@@ -48,8 +48,8 @@ END_OBJECT_MAP()
 // DLL Entry Point
 
 
-#include "syswinwrapper.hxx"
-#include "docholder.hxx"
+#include <syswinwrapper.hxx>
+#include <docholder.hxx>
 
 
 HINSTANCE DocumentHolder::m_hInstance;
diff --git a/embedserv/source/embed/guid.cxx b/embedserv/source/embed/guid.cxx
index f5a55eb943fd..f943eb7220e2 100644
--- a/embedserv/source/embed/guid.cxx
+++ b/embedserv/source/embed/guid.cxx
@@ -20,11 +20,11 @@
 #pragma warning(disable : 4917 4555)
 #endif
 
-#include "common.h"
+#include <common.h>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 
-#include <guid.hxx>
+#include "guid.hxx"
 
 wchar_t const * getStorageTypeFromGUID_Impl( GUID const * guid )
 {
diff --git a/embedserv/source/embed/iipaobj.cxx b/embedserv/source/embed/iipaobj.cxx
index 376247c221f6..6947b1ea6ba8 100644
--- a/embedserv/source/embed/iipaobj.cxx
+++ b/embedserv/source/embed/iipaobj.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "iipaobj.hxx"
-#include "embeddoc.hxx"
+#include <iipaobj.hxx>
+#include <embeddoc.hxx>
 
 
 CIIAObj::CIIAObj(DocumentHolder* pDocHolder)
diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx
index 2890a07b3744..d4c7849b8337 100644
--- a/embedserv/source/embed/register.cxx
+++ b/embedserv/source/embed/register.cxx
@@ -20,7 +20,7 @@
 #pragma warning(disable : 4917 4555)
 #endif
 
-#include "servprov.hxx"
+#include <servprov.hxx>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx
index d44ee2e161da..b39b06b3bd0c 100644
--- a/embedserv/source/embed/servprov.cxx
+++ b/embedserv/source/embed/servprov.cxx
@@ -20,9 +20,9 @@
 #pragma warning(disable : 4917 4555)
 #endif
 
-#include "stdafx.h"
-#include "servprov.hxx"
-#include "embeddoc.hxx"
+#include <stdafx.h>
+#include <servprov.hxx>
+#include <embeddoc.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/diagnose.h>
diff --git a/embedserv/source/embed/syswinwrapper.cxx b/embedserv/source/embed/syswinwrapper.cxx
index ef92307b0d53..8b87a88acc77 100644
--- a/embedserv/source/embed/syswinwrapper.cxx
+++ b/embedserv/source/embed/syswinwrapper.cxx
@@ -20,8 +20,8 @@
 #pragma warning(disable : 4917 4555)
 #endif
 
-#include "docholder.hxx"
-#include "syswinwrapper.hxx"
+#include <docholder.hxx>
+#include <syswinwrapper.hxx>
 
 /*
  * CWindow::CWindow
diff --git a/embedserv/source/embed/tracker.cxx b/embedserv/source/embed/tracker.cxx
index ae30e630f709..ac7a05857ad1 100644
--- a/embedserv/source/embed/tracker.cxx
+++ b/embedserv/source/embed/tracker.cxx
@@ -27,9 +27,9 @@
 #pragma warning(disable : 4917 4555)
 #endif
 
-#include "stdafx.h"
+#include <stdafx.h>
 #include <stddef.h>
-#include "syswinwrapper.hxx"
+#include <syswinwrapper.hxx>
 
 
 static HCURSOR afxCursors[10] = { nullptr, };
diff --git a/embedserv/source/inprocserv/advisesink.cxx b/embedserv/source/inprocserv/advisesink.cxx
index 8028fdb61e28..a73f52e7fb8b 100644
--- a/embedserv/source/inprocserv/advisesink.cxx
+++ b/embedserv/source/inprocserv/advisesink.cxx
@@ -25,7 +25,7 @@
 #pragma warning(disable : 4668)
 #endif
 
-#include <advisesink.hxx>
+#include "advisesink.hxx"
 
 namespace inprocserv
 {
diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx
index f6f3b21d01df..581435cba1c3 100644
--- a/embedserv/source/inprocserv/dllentry.cxx
+++ b/embedserv/source/inprocserv/dllentry.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/types.h"
+#include <sal/types.h>
 
 #include <stdio.h>
-#include <inprocembobj.h>
+#include "inprocembobj.h"
 #include <embservconst.h>
 
 static const GUID* guidList[ SUPPORTED_FACTORIES_NUM ] = {
diff --git a/embedserv/source/inprocserv/inprocembobj.cxx b/embedserv/source/inprocserv/inprocembobj.cxx
index 4cc083652f68..cb43f94fe5ba 100644
--- a/embedserv/source/inprocserv/inprocembobj.cxx
+++ b/embedserv/source/inprocserv/inprocembobj.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/types.h"
+#include <sal/types.h>
 
 #include <embservconst.h>
 #include "inprocembobj.h"
commit ffa11622ea6fc46c427421490b5cc1137b6f0511
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:26:50 2017 +0200

    loplugin:includeform: extensions (Windows)
    
    Change-Id: I6619004353fb7e94506e2a75c77b42156f0b6c6d

diff --git a/extensions/source/activex/SOActionsApproval.cxx b/extensions/source/activex/SOActionsApproval.cxx
index 548eb33ea78c..6b2d179700e9 100644
--- a/extensions/source/activex/SOActionsApproval.cxx
+++ b/extensions/source/activex/SOActionsApproval.cxx
@@ -32,7 +32,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
-#include "so_activex.h"
+#include <so_activex.h>
 #if defined __clang__
 #pragma clang diagnostic pop
 #endif
diff --git a/extensions/source/activex/SOActionsApproval.h b/extensions/source/activex/SOActionsApproval.h
index e61a23357b04..fd0c05331e89 100644
--- a/extensions/source/activex/SOActionsApproval.h
+++ b/extensions/source/activex/SOActionsApproval.h
@@ -37,7 +37,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
-#include "so_activex.h"
+#include <so_activex.h>
 #if defined __clang__
 #pragma clang diagnostic pop
 #endif
diff --git a/extensions/source/activex/SOActiveX.cxx b/extensions/source/activex/SOActiveX.cxx
index 304b74812756..1105dac8561a 100644
--- a/extensions/source/activex/SOActiveX.cxx
+++ b/extensions/source/activex/SOActiveX.cxx
@@ -32,7 +32,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
-#include "so_activex.h"
+#include <so_activex.h>
 #if defined __clang__
 #pragma clang diagnostic pop
 #endif
diff --git a/extensions/source/activex/SOActiveX.h b/extensions/source/activex/SOActiveX.h
index 5f652e6b6752..b850a53a2b01 100644
--- a/extensions/source/activex/SOActiveX.h
+++ b/extensions/source/activex/SOActiveX.h
@@ -37,7 +37,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
-#include "so_activex.h"
+#include <so_activex.h>
 #if defined __clang__
 #pragma clang diagnostic pop
 #endif
diff --git a/extensions/source/activex/SOComWindowPeer.cxx b/extensions/source/activex/SOComWindowPeer.cxx
index a4728a4f0557..4d1da0f2fad8 100644
--- a/extensions/source/activex/SOComWindowPeer.cxx
+++ b/extensions/source/activex/SOComWindowPeer.cxx
@@ -31,7 +31,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
-#include "so_activex.h"
+#include <so_activex.h>
 #if defined __clang__
 #pragma clang diagnostic pop
 #endif
diff --git a/extensions/source/activex/SOComWindowPeer.h b/extensions/source/activex/SOComWindowPeer.h
index 0ff68e8250e6..b06f2efbdd67 100644
--- a/extensions/source/activex/SOComWindowPeer.h
+++ b/extensions/source/activex/SOComWindowPeer.h
@@ -37,7 +37,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
-#include "so_activex.h"
+#include <so_activex.h>
 #if defined __clang__
 #pragma clang diagnostic pop
 #endif
diff --git a/extensions/source/activex/SODispatchInterceptor.cxx b/extensions/source/activex/SODispatchInterceptor.cxx
index 8f90d4fb7f91..ed610c56da8f 100644
--- a/extensions/source/activex/SODispatchInterceptor.cxx
+++ b/extensions/source/activex/SODispatchInterceptor.cxx
@@ -23,7 +23,7 @@
 
 #include <cstddef>
 
-#include "stdio.h"
+#include <stdio.h>
 #include "StdAfx2.h"
 #include "SOActiveX.h"
 #include "SODispatchInterceptor.h"
@@ -34,7 +34,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
-#include "so_activex.h"
+#include <so_activex.h>
 #if defined __clang__
 #pragma clang diagnostic pop
 #endif
diff --git a/extensions/source/activex/SODispatchInterceptor.h b/extensions/source/activex/SODispatchInterceptor.h
index 8705cbfac3c6..dbb2b6a4f031 100644
--- a/extensions/source/activex/SODispatchInterceptor.h
+++ b/extensions/source/activex/SODispatchInterceptor.h
@@ -33,7 +33,7 @@
 
 #include <atlctl.h>
 
-#include "so_activex.h"
+#include <so_activex.h>
 
 class CSOActiveX;
 
diff --git a/extensions/source/activex/so_activex.cxx b/extensions/source/activex/so_activex.cxx
index b9858d01ec6b..2b59692ed804 100644
--- a/extensions/source/activex/so_activex.cxx
+++ b/extensions/source/activex/so_activex.cxx
@@ -23,7 +23,7 @@
 //      To build a separate proxy/stub DLL,
 //      run nmake -f so_activexps.mk in the project directory.
 
-#include "stdio.h"
+#include <stdio.h>
 #include "StdAfx2.h"
 #include "resource.h"
 #include <initguid.h>
@@ -32,7 +32,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
-#include "so_activex.h"
+#include <so_activex.h>
 #if defined __clang__
 #pragma clang diagnostic pop
 #endif
@@ -42,7 +42,7 @@
 #pragma clang diagnostic ignored "-Wextra-tokens"
     // "#endif !_MIDL_USE_GUIDDEF_" in midl-generated code
 #endif
-#include "so_activex_i.c"
+#include <so_activex_i.c>
 #if defined __clang__
 #pragma clang diagnostic pop
 #endif
diff --git a/extensions/source/ole/jscriptclasses.hxx b/extensions/source/ole/jscriptclasses.hxx
index 55278d8982b4..5d43b3a6b772 100644
--- a/extensions/source/ole/jscriptclasses.hxx
+++ b/extensions/source/ole/jscriptclasses.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_OLE_JSCRIPTCLASSES_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_OLE_JSCRIPTCLASSES_HXX
 
-#include <wincrap.hxx>
+#include "wincrap.hxx"
 
 #include "comifaces.hxx"
 
diff --git a/extensions/source/ole/ole2uno.cxx b/extensions/source/ole/ole2uno.cxx
index 59997a142f9f..a42c26fac140 100644
--- a/extensions/source/ole/ole2uno.cxx
+++ b/extensions/source/ole/ole2uno.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include "osl/getglobalmutex.hxx"
-#include "rtl/instance.hxx"
+#include <osl/getglobalmutex.hxx>
+#include <rtl/instance.hxx>
 #include "ole2uno.hxx"
 
 using namespace osl;
diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx
index dae716a28d13..a3447a8d952c 100644
--- a/extensions/source/ole/ole2uno.hxx
+++ b/extensions/source/ole/ole2uno.hxx
@@ -25,7 +25,7 @@
 #pragma once
 #endif
 
-#include <wincrap.hxx>
+#include "wincrap.hxx"
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/extensions/source/ole/unotypewrapper.cxx b/extensions/source/ole/unotypewrapper.cxx
index fa12a9636e53..333ced2f4d45 100644
--- a/extensions/source/ole/unotypewrapper.cxx
+++ b/extensions/source/ole/unotypewrapper.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "unotypewrapper.hxx"
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 #include <osl/diagnose.h>
 #include <o3tl/char16_t2wchar_t.hxx>
 
diff --git a/extensions/source/ole/unotypewrapper.hxx b/extensions/source/ole/unotypewrapper.hxx
index e5b4c3c20dca..4414a654b6bb 100644
--- a/extensions/source/ole/unotypewrapper.hxx
+++ b/extensions/source/ole/unotypewrapper.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_OLE_UNOTYPEWRAPPER_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_OLE_UNOTYPEWRAPPER_HXX
 
-#include <wincrap.hxx>
+#include "wincrap.hxx"
 
 #include "comifaces.hxx"
 
diff --git a/extensions/source/ole/windata.hxx b/extensions/source/ole/windata.hxx
index 11d7ce57827d..69aa63398d18 100644
--- a/extensions/source/ole/windata.hxx
+++ b/extensions/source/ole/windata.hxx
@@ -23,7 +23,7 @@
 #pragma warning (disable:4668)
 #pragma warning (disable:4548)
 
-#include "oleidl.h"
+#include <oleidl.h>
 
 #if defined __clang__
 #pragma clang diagnostic push
@@ -45,7 +45,7 @@
 
 #pragma warning (pop)
 
-#include "osl/diagnose.h"
+#include <osl/diagnose.h>
 
 namespace ole_adapter
 {
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index 437b408a6918..ef70a9b5adbf 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -44,7 +44,7 @@
 #pragma warning (push,1)
 #pragma warning (disable:4668)
 #endif
-#include "twain/twain.h"
+#include <twain/twain.h>
 #if defined _MSC_VER
 #pragma warning (pop)
 #endif
diff --git a/extensions/source/update/check/onlinecheck.cxx b/extensions/source/update/check/onlinecheck.cxx
index be6912f17afb..fd77299d11ef 100644
--- a/extensions/source/update/check/onlinecheck.cxx
+++ b/extensions/source/update/check/onlinecheck.cxx
@@ -24,7 +24,7 @@
 #include <sal/types.h>
 #include <sal/macros.h>
 
-#include <onlinecheck.hxx>
+#include "onlinecheck.hxx"
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
commit f32488182e6f03bddd5148e817a4d1dc569edde1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:26:41 2017 +0200

    loplugin:includeform: fpicker (Windows)
    
    Change-Id: Iaa3b4b6d3de8e26de8a1ede68f59840264839f80

diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx
index 7e055c5d8ce1..bc9c270774b5 100644
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/misc/resourceprovider.cxx
@@ -32,7 +32,7 @@
 #include <unotools/resmgr.hxx>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include "fpsofficeResMgr.hxx"
+#include <fpsofficeResMgr.hxx>
 
 using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
 using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
commit 2954641da502f9602dd6f179e68f215d3b8feb0d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:26:32 2017 +0200

    loplugin:includeform: hwpfilter (Windows)
    
    Change-Id: I35accf3f61cea9bdca93f5b2f0e93dab89dfe41d

diff --git a/hwpfilter/source/precompile.h b/hwpfilter/source/precompile.h
index 218b9160edf6..7a9c9354c443 100644
--- a/hwpfilter/source/precompile.h
+++ b/hwpfilter/source/precompile.h
@@ -22,8 +22,8 @@
         #pragma warning(push, 1)
     #endif
     #define WIN32_LEAN_AND_MEAN
-    #include "windows.h"
-    #include "crtdbg.h"
+    #include <windows.h>
+    #include <crtdbg.h>
     #if defined _MSC_VER
         #pragma warning(pop)
     #endif
commit c553f94f132e522e7487744ac2fda71d266ba0e4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:26:23 2017 +0200

    loplugin:includeform: i18nlangtag (Windows)
    
    Change-Id: I932552d72767df1b05e2cb8137eb467835b4dbac

diff --git a/i18nlangtag/source/isolang/inwnt.cxx b/i18nlangtag/source/isolang/inwnt.cxx
index 6ad9b54e8630..7e868acf0b3d 100644
--- a/i18nlangtag/source/isolang/inwnt.cxx
+++ b/i18nlangtag/source/isolang/inwnt.cxx
@@ -31,7 +31,7 @@
 #endif
 #include <osl/mutex.hxx>
 #include <rtl/instance.hxx>
-#include "i18nlangtag/mslangid.hxx"
+#include <i18nlangtag/mslangid.hxx>
 
 static LanguageType nImplSystemLanguage = LANGUAGE_DONTKNOW;
 static LanguageType nImplSystemUILanguage = LANGUAGE_DONTKNOW;
commit 2942544155a0485616b7cb42b92170da430a4a7d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:26:12 2017 +0200

    loplugin:includeform: jurt (Windows)
    
    Change-Id: I8f9c8bdcb3cabc47dfd211c28a70e90aae86339a

diff --git a/jurt/source/pipe/wrapper/wrapper.c b/jurt/source/pipe/wrapper/wrapper.c
index bb36814f5913..aefaa3719183 100644
--- a/jurt/source/pipe/wrapper/wrapper.c
+++ b/jurt/source/pipe/wrapper/wrapper.c
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <stddef.h>
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-#include "jni.h"
-#include "sal/types.h"
+#include <jni.h>
+#include <sal/types.h>
 
 
 static HMODULE   module   = NULL;
commit 57763d2e796393cb072e44e5ec87d3fb33dd2cce
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:26:06 2017 +0200

    loplugin:includeform: odk (Windows)
    
    Change-Id: I654aa2cf1175f91619b70c9257e88f7006b0c04c

diff --git a/odk/source/unoapploader/win/unoapploader.c b/odk/source/unoapploader/win/unoapploader.c
index 4ad8685924e3..d07366065075 100644
--- a/odk/source/unoapploader/win/unoapploader.c
+++ b/odk/source/unoapploader/win/unoapploader.c
@@ -33,8 +33,8 @@
 #pragma warning(pop)
 #endif
 
-#include "cppuhelper/findsofficepath.h"
-#include "sal/types.h"
+#include <cppuhelper/findsofficepath.h>
+#include <sal/types.h>
 
 #define MY_SIZE(s) (sizeof (s) / sizeof *(s))
 #define MY_LENGTH(s) (MY_SIZE(s) - 1)
commit 15eeba3d537c72ae9bbf8214d69d3f57d3013902
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:26:00 2017 +0200

    loplugin:includeform: pyuno (Windows)
    
    Change-Id: I07b13573fb45847bd31be6d195d0ebb5943e25bb

diff --git a/pyuno/zipcore/python.cxx b/pyuno/zipcore/python.cxx
index c128938cbc8f..9c6ef836311f 100644
--- a/pyuno/zipcore/python.cxx
+++ b/pyuno/zipcore/python.cxx
@@ -28,7 +28,7 @@
 #include <windows.h>
 #pragma warning(pop)
 
-#include "tools/pathutils.hxx"
+#include <tools/pathutils.hxx>
 
 #define MY_LENGTH(s) (sizeof (s) / sizeof *(s) - 1)
 #define MY_STRING(s) (s), MY_LENGTH(s)
commit 16faecdad480007073ffcb9dd3094afb1e97390f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:25:51 2017 +0200

    loplugin:includeform: sal (Windows)
    
    Change-Id: Id60bcfadbfdf4b37f276159b12360347bde30a2e

diff --git a/sal/osl/w32/backtrace.cxx b/sal/osl/w32/backtrace.cxx
index 408bd655e777..e5a6e5873e68 100644
--- a/sal/osl/w32/backtrace.cxx
+++ b/sal/osl/w32/backtrace.cxx
@@ -24,7 +24,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <sal/backtrace.hxx>
 
-#include "backtraceasstring.hxx"
+#include <backtraceasstring.hxx>
 
 namespace {
 
diff --git a/sal/osl/w32/dllentry.cxx b/sal/osl/w32/dllentry.cxx
index 52159853eb3e..77d16e9fb5d4 100644
--- a/sal/osl/w32/dllentry.cxx
+++ b/sal/osl/w32/dllentry.cxx
@@ -33,9 +33,9 @@
 
 #include "file_url.hxx"
 #include "gmutex.hxx"
-#include "rtllifecycle.h"
+#include <rtllifecycle.h>
 
-#include <thread.hxx>
+#include "thread.hxx"
 
 /*
 This is needed because DllMain is called after static constructors. A DLL's
diff --git a/sal/osl/w32/file_error.cxx b/sal/osl/w32/file_error.cxx
index bfa55bff9009..da71664b6fdb 100644
--- a/sal/osl/w32/file_error.cxx
+++ b/sal/osl/w32/file_error.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "file_error.hxx"
-#include "winerror.h"
+#include <winerror.h>
 
 /* OS error to oslFileError values mapping table */
 struct osl_file_error_entry
diff --git a/sal/osl/w32/file_error.hxx b/sal/osl/w32/file_error.hxx
index 57d825b7e00f..714297c11eb9 100644
--- a/sal/osl/w32/file_error.hxx
+++ b/sal/osl/w32/file_error.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SAL_OSL_W32_FILE_ERROR_HXX
 #define INCLUDED_SAL_OSL_W32_FILE_ERROR_HXX
 
-#include "osl/file.h"
+#include <osl/file.h>
 
 oslFileError oslTranslateFileError (/*DWORD*/ unsigned long dwError);
 
diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index e5fac8590a53..568abf19fd7c 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "systools/win32/uwinapi.h"
+#include <systools/win32/uwinapi.h>
 
 #include "file_url.hxx"
 #include "file_error.hxx"
diff --git a/sal/osl/w32/file_url.hxx b/sal/osl/w32/file_url.hxx
index 43bed9100bdb..9661543639c9 100644
--- a/sal/osl/w32/file_url.hxx
+++ b/sal/osl/w32/file_url.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_SAL_OSL_W32_FILE_URL_HXX
 #define INCLUDED_SAL_OSL_W32_FILE_URL_HXX
 
-#include "sal/types.h"
-#include "rtl/ustring.h"
-#include "osl/file.h"
-#include "osl/mutex.h"
+#include <sal/types.h>
+#include <rtl/ustring.h>
+#include <osl/file.h>
+#include <osl/mutex.h>
 
 #ifdef _MSC_VER
 #pragma warning(push,1)
diff --git a/sal/osl/w32/nlsupport.cxx b/sal/osl/w32/nlsupport.cxx
index 9a7c41040c26..5c937ed6de39 100644
--- a/sal/osl/w32/nlsupport.cxx
+++ b/sal/osl/w32/nlsupport.cxx
@@ -27,7 +27,7 @@
 #endif
 #include <wchar.h>
 
-#include <nlsupport.hxx>
+#include "nlsupport.hxx"
 
 #include <osl/mutex.h>
 #include <osl/nlsupport.h>
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 0fe42bbdbe27..0636278ab7d6 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -33,8 +33,8 @@
 #include <osl/nlsupport.h>
 #include <o3tl/char16_t2wchar_t.hxx>
 
-#include <filetime.hxx>
-#include <nlsupport.hxx>
+#include "filetime.hxx"
+#include "nlsupport.hxx"
 #include "procimpl.hxx"
 #include "file_url.hxx"
 #include "path_helper.hxx"
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index da48691685fc..dcaca741ae1f 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -29,7 +29,7 @@
 # undef WIN32_LEAN_AND_MEAN
 #endif
 
-#include <file-impl.hxx>
+#include "file-impl.hxx"
 #include "procimpl.hxx"
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/sal/osl/w32/salinit.cxx b/sal/osl/w32/salinit.cxx
index c97afe0d843d..71c14e66a566 100644
--- a/sal/osl/w32/salinit.cxx
+++ b/sal/osl/w32/salinit.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 "system.h"
 #include "time.hxx"
diff --git a/sal/osl/w32/tempfile.cxx b/sal/osl/w32/tempfile.cxx
index a538b5dd9720..5424bfbde077 100644
--- a/sal/osl/w32/tempfile.cxx
+++ b/sal/osl/w32/tempfile.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "systools/win32/uwinapi.h"
+#include <systools/win32/uwinapi.h>
 
-#include "osl/file.h"
+#include <osl/file.h>
 #include <o3tl/char16_t2wchar_t.hxx>
 
-#include <file-impl.hxx>
+#include "file-impl.hxx"
 #include "file_error.hxx"
 #include "file_url.hxx"
 #include "path_helper.hxx"
diff --git a/sal/osl/w32/thread.cxx b/sal/osl/w32/thread.cxx
index 6de040c482f2..1c2e9894956b 100644
--- a/sal/osl/w32/thread.cxx
+++ b/sal/osl/w32/thread.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "system.h"
-#include <thread.hxx>
+#include "thread.hxx"
 
 #include <osl/diagnose.h>
 #include <osl/thread.h>
diff --git a/sal/osl/w32/time.cxx b/sal/osl/w32/time.cxx
index b503a05e81dc..51f05ab30a4c 100644
--- a/sal/osl/w32/time.cxx
+++ b/sal/osl/w32/time.cxx
@@ -20,8 +20,8 @@
 #include <sal/config.h>
 #include "system.h"
 
-#include <filetime.hxx>
-#include <time.hxx>
+#include "filetime.hxx"
+#include "time.hxx"
 
 #include <osl/diagnose.h>
 #include <osl/time.h>
commit 33f67eee3eca8b2bb671b0eda79c81c73a092466
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:25:42 2017 +0200

    loplugin:includeform: setup_native (Windows)
    
    Change-Id: I58cae555a303a8657955ceec08065e8b440bdad4

diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx
index e74e0660f6a6..419bf385d02e 100644
--- a/setup_native/source/win32/customactions/sellang/sellang.cxx
+++ b/setup_native/source/win32/customactions/sellang/sellang.cxx
@@ -35,7 +35,7 @@
 #include <systools/win32/uwinapi.h>
 #include <algorithm>
 
-#include "spellchecker_selection.hxx"
+#include <spellchecker_selection.hxx>
 
 BOOL GetMsiPropA( MSIHANDLE hMSI, const char* pPropName, char** ppValue )
 {
diff --git a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
index 02bd6936ecb8..9f7080984293 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
@@ -26,7 +26,7 @@
 #include <stdio.h>
 
 #include <systools/win32/uwinapi.h>
-#include <../tools/seterror.hxx>
+#include "../tools/seterror.hxx"
 
 extern "C" UINT __stdcall CheckInstallDirectory(MSIHANDLE handle)
 {
diff --git a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
index 0ec17b0e5a1d..1d5c0e9f9e22 100644
--- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
@@ -22,7 +22,7 @@
 #include <strsafe.h>
 
 #include <systools/win32/uwinapi.h>
-#include <../tools/seterror.hxx>
+#include "../tools/seterror.hxx"
 
 static BOOL RemoveCompleteDirectoryW(const std::wstring& rPath)
 {
commit 7baaf973cecb18d171f7b7b4ad04990f63fbde3b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:25:34 2017 +0200

    loplugin:includeform: sfx2 (Windows)
    
    Change-Id: I2ce3e5012b368a9e390d927a3dfd2150c0d5d9f7

diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index e3bf7eabceae..2b6514445d7f 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -34,7 +34,7 @@
 #undef WB_RIGHT
 
 #include "shutdownicon.hxx"
-#include "sfx2/strings.hrc"
+#include <sfx2/strings.hrc>
 #include <shlobj.h>
 #include <objidl.h>
 #include <osl/thread.h>
commit cf98d5baf8da031086fadf23ea731b3f2c183ca7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 27 19:25:27 2017 +0200

    loplugin:includeform: shell (Windows)
    
    Change-Id: I80109e4e60b0f72efee53509d5539918cec789bd

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

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list