loplugin:includeform: extensions

Change-Id: I2f9001ddae6cbcef51ba2c0415baa727f211261d

63 files changed, 151 insertions, 151 deletions

diff --git a/extensions/source/abpilot/abspage.hxx b/extensions/source/abpilot/abspage.hxx
index 8a7826ad93bf..4a0a8d782463 100644
--- a/extensions/source/abpilot/abspage.hxx
+++ b/extensions/source/abpilot/abspage.hxx
@@ -22,8 +22,8 @@
 
 #include <svtools/wizardmachine.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include "strings.hrc"
-#include "componentmodule.hxx"
+#include <strings.hrc>
+#include <componentmodule.hxx>
 #include <vcl/fixed.hxx>
 
 
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index ca485fee4bdb..ff41cbd1698a 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -18,9 +18,9 @@
  */
 
 #include "abspilot.hxx"
-#include "helpids.h"
-#include "strings.hrc"
-#include "componentmodule.hxx"
+#include <helpids.h>
+#include <strings.hrc>
+#include <componentmodule.hxx>
 #include <comphelper/processfactory.hxx>
 #include <tools/debug.hxx>
 #include "typeselectionpage.hxx"
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx
index 7253d400fbc5..9f1706f2c086 100644
--- a/extensions/source/abpilot/admininvokationimpl.cxx
+++ b/extensions/source/abpilot/admininvokationimpl.cxx
@@ -26,8 +26,8 @@
 #include <comphelper/propertysequence.hxx>
 #include <vcl/stdtext.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include "strings.hrc"
-#include "componentmodule.hxx"
+#include <strings.hrc>
+#include <componentmodule.hxx>
 #include <vcl/waitobj.hxx>
 
 
diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx
index af975768d3b4..16c955b3f217 100644
--- a/extensions/source/abpilot/admininvokationpage.cxx
+++ b/extensions/source/abpilot/admininvokationpage.cxx
@@ -20,7 +20,7 @@
 #include "admininvokationpage.hxx"
 #include "abspilot.hxx"
 #include "admininvokationimpl.hxx"
-#include "comphelper/processfactory.hxx"
+#include <comphelper/processfactory.hxx>
 
 namespace abp
 {
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index 5acd30aa226e..17d1ad154a23 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -18,9 +18,9 @@
  */
 
 
-#include "strings.hrc"
+#include <strings.hrc>
 #include "abptypes.hxx"
-#include "componentmodule.hxx"
+#include <componentmodule.hxx>
 #include "datasourcehandling.hxx"
 #include "addresssettings.hxx"
 
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index 609beeeef162..f78293f047e8 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -29,10 +29,10 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/stdtext.hxx>
 #include <com/sun/star/util/AliasProgrammaticPair.hpp>
-#include "strings.hrc"
-#include "componentmodule.hxx"
+#include <strings.hrc>
+#include <componentmodule.hxx>
 #include <unotools/confignode.hxx>
-#include "sal/macros.h"
+#include <sal/macros.h>
 
 
 namespace abp
diff --git a/extensions/source/abpilot/moduleabp.cxx b/extensions/source/abpilot/moduleabp.cxx
index 7acf39562dbd..ce028b6d8d18 100644
--- a/extensions/source/abpilot/moduleabp.cxx
+++ b/extensions/source/abpilot/moduleabp.cxx
@@ -18,6 +18,6 @@
  */
 
 
-#include "componentmodule.cxx"
+#include <componentmodule.cxx>
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx
index a2ab837a0bb4..5bf30a9e0c13 100644
--- a/extensions/source/abpilot/unodialogabp.hxx
+++ b/extensions/source/abpilot/unodialogabp.hxx
@@ -22,7 +22,7 @@
 
 #include <svtools/genericunodialog.hxx>
 #include <comphelper/proparrhlp.hxx>
-#include "componentmodule.hxx"
+#include <componentmodule.hxx>
 #include <com/sun/star/task/XJob.hpp>
 #include <cppuhelper/implbase1.hxx>
 
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index 5b69893dfe72..2f57ca2bd178 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 
-#include "helpids.h"
+#include <helpids.h>
 #include <vcl/lstbox.hxx>
 #include <vcl/edit.hxx>
 #include <tools/debug.hxx>
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index ba0f0c0a960a..20e9b0948fc0 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -19,7 +19,7 @@
 
 
 #include <memory>
-#include <bibconfig.hxx>
+#include "bibconfig.hxx"
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 22cf6b8275b0..ee7ef3df942e 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -52,14 +52,14 @@
 #include <svtools/svmedit.hxx>
 
 #include "bibresid.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 #include "bibcont.hxx"
 #include "bibbeam.hxx"
 #include "bibmod.hxx"
 #include "bibview.hxx"
 #include "framectr.hxx"
 #include "datman.hxx"
-#include <bibconfig.hxx>
+#include "bibconfig.hxx"
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index c614c990ab2b..33a0df0d564d 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "strings.hrc"
+#include <strings.hrc>
 #include "bibcont.hxx"
 #include "bibbeam.hxx"
 #include "general.hxx"
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 5afbd5f33590..fbff6cbe5d69 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -69,8 +69,8 @@
 #include "bibconfig.hxx"
 #include "bibbeam.hxx"
 #include "general.hxx"
-#include "strings.hrc"
-#include "helpids.h"
+#include <strings.hrc>
+#include <helpids.h>
 #include <connectivity/dbtools.hxx>
 #include <memory>
 
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 191131b068a2..6fc72513f34f 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -27,12 +27,12 @@
 #include "datman.hxx"
 #include "bibview.hxx"
 #include "bibresid.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 #include <toolkit/helper/vclunohelper.hxx>
 #include "bibconfig.hxx"
 #include <cppuhelper/implbase.hxx>
 #include <vcl/svapp.hxx>
-#include "helpids.h"
+#include <helpids.h>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/form/XConfirmDeleteListener.hpp>
 #include <com/sun/star/form/runtime/XFormController.hpp>
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 3bfb47608803..2d5594c478e0 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -33,11 +33,11 @@
 #include "datman.hxx"
 #include "bibconfig.hxx"
 #include "bibprop.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 #include "bibmod.hxx"
 #include "bibview.hxx"
 #include "bibtools.hxx"
-#include "helpids.h"
+#include <helpids.h>
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 1c10eafaba48..04a8f6f960e6 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
-#include <datman.hxx>
+#include "datman.hxx"
 #include <o3tl/any.hxx>
 #include <svx/svxids.hrc>
 #include <svtools/miscopt.hxx>
@@ -34,8 +34,8 @@
 #include "bibbeam.hxx"
 #include "bibview.hxx"
 #include "bibresid.hxx"
-#include "strings.hrc"
-#include "bitmaps.hlst"
+#include <strings.hrc>
+#include <bitmaps.hlst>
 
 #include "bibtools.hxx"
 
diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx
index 7f9cf6673fba..45ac6b0e91a2 100644
--- a/extensions/source/config/ldap/ldapaccess.hxx
+++ b/extensions/source/config/ldap/ldapaccess.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_CONFIG_LDAP_LDAPACCESS_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_CONFIG_LDAP_LDAPACCESS_HXX
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <map>
 
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index a5948829afe5..08beda2a170b 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -18,9 +18,9 @@
  */
 
 #include "commonpagesdbp.hxx"
-#include "strings.hrc"
-#include "bitmaps.hlst"
-#include "componentmodule.hxx"
+#include <strings.hrc>
+#include <bitmaps.hlst>
+#include <componentmodule.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sdb/XCompletedConnection.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx
index 4ae22c35f5d9..54453fcc071c 100644
--- a/extensions/source/dbpilots/controlwizard.hxx
+++ b/extensions/source/dbpilots/controlwizard.hxx
@@ -31,8 +31,8 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/combobox.hxx>
 #include "dbptypes.hxx"
-#include "strings.hrc"
-#include "componentmodule.hxx"
+#include <strings.hrc>
+#include <componentmodule.hxx>
 #include "wizardcontext.hxx"
 
 class ResId;
diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx
index d898bc89cacc..18846e96ae2b 100644
--- a/extensions/source/dbpilots/dbpservices.cxx
+++ b/extensions/source/dbpilots/dbpservices.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "componentmodule.hxx"
+#include <componentmodule.hxx>
 #include "dbpservices.hxx"
 
 using namespace ::com::sun::star::uno;
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 87cd21f0358a..01d6912b5b29 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.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 <vector>
 
@@ -30,7 +30,7 @@
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include "dbptools.hxx"
-#include "helpids.h"
+#include <helpids.h>
 
 #define GW_STATE_DATASOURCE_SELECTION   0
 #define GW_STATE_FIELDSELECTION         1
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 46e2cd902240..ef5c55f9954c 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -23,7 +23,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 #include "optiongrouplayouter.hxx"
-#include "helpids.h"
+#include <helpids.h>
 #include <comphelper/processfactory.hxx>
 
 #define GBW_STATE_OPTIONLIST        0
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index ae2426a657fe..8f4342e2add5 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -27,7 +27,7 @@
 #include <tools/debug.hxx>
 #include <vcl/msgbox.hxx>
 #include <connectivity/dbtools.hxx>
-#include "helpids.h"
+#include <helpids.h>
 #include <comphelper/extract.hxx>
 
 
diff --git a/extensions/source/dbpilots/moduledbp.cxx b/extensions/source/dbpilots/moduledbp.cxx
index 7acf39562dbd..ce028b6d8d18 100644
--- a/extensions/source/dbpilots/moduledbp.cxx
+++ b/extensions/source/dbpilots/moduledbp.cxx
@@ -18,6 +18,6 @@
  */
 
 
-#include "componentmodule.cxx"
+#include <componentmodule.cxx>
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx
index 68180d2bb486..1ab19e75ced7 100644
--- a/extensions/source/dbpilots/unoautopilot.hxx
+++ b/extensions/source/dbpilots/unoautopilot.hxx
@@ -23,7 +23,7 @@
 #include <svtools/genericunodialog.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/proparrhlp.hxx>
-#include "componentmodule.hxx"
+#include <componentmodule.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx
index 5f8a8e744af5..02caf4a82089 100644
--- a/extensions/source/dbpilots/wizardservices.cxx
+++ b/extensions/source/dbpilots/wizardservices.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 "dbpservices.hxx"
 #include "wizardservices.hxx"
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 6abce4412afe..2d53642bf580 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "browserlistbox.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 #include "proplinelistener.hxx"
 #include "propcontrolobserver.hxx"
 #include "linedescriptor.hxx"
diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx
index 86629b5e0024..3418d642d3e5 100644
--- a/extensions/source/propctrlr/browserview.cxx
+++ b/extensions/source/propctrlr/browserview.cxx
@@ -19,8 +19,8 @@
 
 #include "browserview.hxx"
 #include "propertyeditor.hxx"
-#include "helpids.h"
-#include "propctrlr.h"
+#include <helpids.h>
+#include <propctrlr.h>
 #include <vcl/tabpage.hxx>
 #include <memory>
 
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx
index 839fe8250291..13f7ca368e4e 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -20,10 +20,10 @@
 #include "defaultforminspection.hxx"
 #include "pcrcommon.hxx"
 #include "pcrservices.hxx"
-#include "helpids.h"
-#include "strings.hrc"
+#include <helpids.h>
+#include <strings.hrc>
 #include "modulepcr.hxx"
-#include "propctrlr.h"
+#include <propctrlr.h>
 #include "formmetadata.hxx"
 
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index b907eec8b249..047022f53994 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -20,7 +20,7 @@
 #include <memory>
 #include "eformshelper.hxx"
 #include "formstrings.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 #include "modulepcr.hxx"
 #include "propeventtranslation.hxx"
 #include "formbrowsertools.hxx"
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index 5593fce5e1bf..645e4c7c1693 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -21,7 +21,7 @@
 #include "formstrings.hxx"
 #include "formmetadata.hxx"
 #include "pcrservices.hxx"
-#include "propctrlr.h"
+#include <propctrlr.h>
 #include "formbrowsertools.hxx"
 #include "eformshelper.hxx"
 #include "handlerhelper.hxx"
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 1d219329c66c..e3112138f5a5 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -20,10 +20,10 @@
 
 #include "eventhandler.hxx"
 #include "pcrservices.hxx"
-#include "helpids.h"
-#include "propctrlr.h"
+#include <helpids.h>
+#include <propctrlr.h>
 #include "formbrowsertools.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 #include "formstrings.hxx"
 #include "handlerhelper.hxx"
 #include "modulepcr.hxx"
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 8be50c9f502b..447583056343 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -19,7 +19,7 @@
 
 #include <sfx2/sfxsids.hrc>
 #include "fontdialog.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 #include "modulepcr.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/unohelp.hxx>
diff --git a/extensions/source/propctrlr/formbrowsertools.cxx b/extensions/source/propctrlr/formbrowsertools.cxx
index fe64952d7df6..b31aa0ce4021 100644
--- a/extensions/source/propctrlr/formbrowsertools.cxx
+++ b/extensions/source/propctrlr/formbrowsertools.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <osl/diagnose.h>
-#include "strings.hrc"
+#include <strings.hrc>
 #include "modulepcr.hxx"
 #include "formstrings.hxx"
 
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index d37bc2c345fb..799a1d5545d7 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -20,14 +20,14 @@
 
 #include "controltype.hxx"
 #include "pcrservices.hxx"
-#include "propctrlr.h"
+#include <propctrlr.h>
 #include "fontdialog.hxx"
 #include "formcomponenthandler.hxx"
 #include "formlinkdialog.hxx"
 #include "formmetadata.hxx"
-#include "strings.hrc"
-#include "showhide.hrc"
-#include "yesno.hrc"
+#include <strings.hrc>
+#include <showhide.hrc>
+#include <yesno.hrc>
 #include "formstrings.hxx"
 #include "handlerhelper.hxx"
 #include "listselectiondlg.hxx"
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index 27258f949977..b01833515b4c 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -22,7 +22,7 @@
 #include "pcrservices.hxx"
 #include "formstrings.hxx"
 #include "defaultforminspection.hxx"
-#include "propctrlr.h"
+#include <propctrlr.h>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/util/VetoException.hpp>
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index b22fdf9fc892..7ee0a03ed111 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -21,7 +21,7 @@
 #include "formlinkdialog.hxx"
 
 #include "modulepcr.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 #include "formstrings.hxx"
 #include <sal/log.hxx>
 #include <vcl/combobox.hxx>
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index 9702ba07e712..1cf15dcfe7b9 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -19,11 +19,11 @@
 
 #include "formmetadata.hxx"
 #include "formstrings.hxx"
-#include "command.hrc"
-#include "helpids.h"
-#include "strings.hrc"
-#include "stringarrays.hrc"
-#include "propctrlr.h"
+#include <command.hrc>
+#include <helpids.h>
+#include <strings.hrc>
+#include <stringarrays.hrc>
+#include <propctrlr.h>
 #include <comphelper/extract.hxx>
 #include <osl/diagnose.h>
 #include <sal/macros.h>
diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx
index 157e5362bf1e..e89612e75c70 100644
--- a/extensions/source/propctrlr/handlerhelper.cxx
+++ b/extensions/source/propctrlr/handlerhelper.cxx
@@ -18,14 +18,14 @@
  */
 
 #include "handlerhelper.hxx"
-#include "strings.hrc"
-#include "yesno.hrc"
+#include <strings.hrc>
+#include <yesno.hrc>
 #include <comphelper/extract.hxx>
 #include "modulepcr.hxx"
 #include "enumrepresentation.hxx"
 #include "formmetadata.hxx"
 
-#include "com/sun/star/inspection/StringRepresentation.hpp"
+#include <com/sun/star/inspection/StringRepresentation.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx
index 26b4b47379c0..05accc9b1365 100644
--- a/extensions/source/propctrlr/inspectorhelpwindow.cxx
+++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx
@@ -18,7 +18,7 @@
  */
 #include "inspectorhelpwindow.hxx"
 #include "modulepcr.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 
 
 namespace pcr
diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx
index 86525d5f175e..d1ce396bac15 100644
--- a/extensions/source/propctrlr/listselectiondlg.cxx
+++ b/extensions/source/propctrlr/listselectiondlg.cxx
@@ -20,7 +20,7 @@
 #include "listselectiondlg.hxx"
 
 #include "modulepcr.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 #include "formstrings.hxx"
 #include <vcl/msgbox.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx
index 693b6284baae..6aa4dc633992 100644
--- a/extensions/source/propctrlr/newdatatype.cxx
+++ b/extensions/source/propctrlr/newdatatype.cxx
@@ -19,7 +19,7 @@
 
 #include "newdatatype.hxx"
 #include "modulepcr.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 
 namespace pcr
 {
diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx
index cc47c64515fa..ff65c025f43f 100644
--- a/extensions/source/propctrlr/pcrcommon.cxx
+++ b/extensions/source/propctrlr/pcrcommon.cxx
@@ -19,7 +19,7 @@
 
 #include "pcrcommon.hxx"
 #include "modulepcr.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 
 #include <com/sun/star/util/MeasureUnit.hpp>
 #include <rtl/ustrbuf.hxx>
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 19053c6257b4..6ee3d63b46f0 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -22,7 +22,7 @@
 #include "pcrstrings.hxx"
 #include "standardcontrol.hxx"
 #include "linedescriptor.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 #include "propertyeditor.hxx"
 #include "modulepcr.hxx"
 #include "formstrings.hxx"
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index a2ef815cdfff..82262284d70e 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "selectlabeldialog.hxx"
-#include "strings.hrc"
-#include "bitmaps.hlst"
+#include <strings.hrc>
+#include <bitmaps.hlst>
 #include "formbrowsertools.hxx"
 #include "formstrings.hxx"
 #include <com/sun/star/form/FormComponentType.hpp>
@@ -30,7 +30,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <comphelper/property.hxx>
 #include <comphelper/types.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 
 
 namespace pcr
diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx
index ef129eb18935..63c9528754ed 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.cxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.cxx
@@ -19,8 +19,8 @@
 
 #include "sqlcommanddesign.hxx"
 #include "formstrings.hxx"
-#include "command.hrc"
-#include "strings.hrc"
+#include <command.hrc>
+#include <strings.hrc>
 #include "modulepcr.hxx"
 #include "unourl.hxx"
 
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx
index 045622d612e6..bfc1936f0ff4 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -17,17 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
-#include "cppuhelper/factory.hxx"
-#include "cppuhelper/implementationentry.hxx"
+#include <cppuhelper/factory.hxx>
+#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/inspection/XStringRepresentation.hpp"
-#include "com/sun/star/lang/XInitialization.hpp"
-#include "com/sun/star/script/CannotConvertException.hpp"
-#include "com/sun/star/script/XTypeConverter.hpp"
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/inspection/XStringRepresentation.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/script/CannotConvertException.hpp>
+#include <com/sun/star/script/XTypeConverter.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/reflection/XConstantsTypeDescription.hpp>
 #include <com/sun/star/beans/XIntrospection.hpp>
@@ -36,8 +36,8 @@
 #include <com/sun/star/util/Time.hpp>
 #include <comphelper/sequence.hxx>
 #include <connectivity/dbconversion.hxx>
-#include "strings.hrc"
-#include "yesno.hrc"
+#include <strings.hrc>
+#include <yesno.hrc>
 #include "pcrservices.hxx"
 #include <comphelper/types.hxx>
 #include "modulepcr.hxx"
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 9e3cd26170a9..3b6c071737dc 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -20,8 +20,8 @@
 #include "taborder.hxx"
 
 #include "modulepcr.hxx"
-#include "strings.hrc"
-#include "bitmaps.hlst"
+#include <strings.hrc>
+#include <bitmaps.hlst>
 #include "formstrings.hxx"
 #include <comphelper/types.hxx>
 #include <comphelper/property.hxx>
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index a030a867deed..7edad44a1367 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -27,7 +27,7 @@
 #include <connectivity/dbconversion.hxx>
 #include <com/sun/star/util/Time.hpp>
 #include "modulepcr.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 
 
 namespace pcr
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index 6c9e10a2f47c..de22c3c9ac8d 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -25,8 +25,8 @@
 #include "formmetadata.hxx"
 #include "xsddatatypes.hxx"
 #include "modulepcr.hxx"
-#include "strings.hrc"
-#include "propctrlr.h"
+#include <strings.hrc>
+#include <propctrlr.h>
 #include "newdatatype.hxx"
 #include "xsdvalidationhelper.hxx"
 #include "pcrcommon.hxx"
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index 7acef8421f71..47f90a77061e 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -25,7 +25,7 @@
 
 #include <cmath>
 
-#include <grid.hxx>
+#include "grid.hxx"
 #include <vcl/builderfactory.hxx>
 
 #include <algorithm>
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index 6d29d0a5670d..330d3a79ef29 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -24,7 +24,7 @@
 #include <sal/log.hxx>
 #include <tools/stream.hxx>
 #include <unotools/tempfile.hxx>
-#include <sane.hxx>
+#include "sane.hxx"
 #include <dlfcn.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx
index c642e91137ea..e3694a3ff58a 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -23,7 +23,7 @@
 #include <osl/module.h>
 #include <vcl/bitmap.hxx>
 #include <sane/sane.h>
-#include <scanner.hxx>
+#include "scanner.hxx"
 
 
 class BitmapTransporter: public cppu::WeakImplHelper<css::awt::XBitmap>
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 67de8730e624..1d5baeda124f 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -26,13 +26,13 @@
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/builderfactory.hxx>
-#include <sanedlg.hxx>
-#include <grid.hxx>
+#include "sanedlg.hxx"
+#include "grid.hxx"
 #include <math.h>
 #include <sal/macros.h>
 #include <rtl/strbuf.hxx>
 #include <memory>
-#include "strings.hrc"
+#include <strings.hrc>
 
 #define PREVIEW_WIDTH       113
 #define PREVIEW_HEIGHT      160
diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx
index 555ffb9a33ee..91dd9843bd1a 100644
--- a/extensions/source/scanner/sanedlg.hxx
+++ b/extensions/source/scanner/sanedlg.hxx
@@ -28,7 +28,7 @@
 #include <vcl/edit.hxx>
 #include <svtools/treelistbox.hxx>
 
-#include <sane.hxx>
+#include "sane.hxx"
 
 class ScanPreview;
 
diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx
index 46eac7ca64ad..3fdf09c18e8f 100644
--- a/extensions/source/scanner/scanner.cxx
+++ b/extensions/source/scanner/scanner.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <scanner.hxx>
+#include "scanner.hxx"
 
 #include <cppuhelper/supportsservice.hxx>
 
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index ba7a9ef97cfe..8d38481ba1d9 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <scanner.hxx>
-#include <sanedlg.hxx>
+#include "scanner.hxx"
+#include "sanedlg.hxx"
 #include <osl/thread.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <memory>
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 817fc5ac8175..7e59bfc9a7ea 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -51,7 +51,7 @@
 #endif
 #endif
 
-#include <onlinecheck.hxx>
+#include "onlinecheck.hxx"
 #include "updateprotocol.hxx"
 #include "updatecheckconfig.hxx"
 
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index 2bbdf182f631..09161454e880 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -29,8 +29,8 @@
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
-#include "com/sun/star/frame/Desktop.hpp"
-#include "com/sun/star/frame/XTerminateListener.hpp"
+#include <com/sun/star/frame/Desktop.hpp>
+#include <com/sun/star/frame/XTerminateListener.hpp>
 #include <com/sun/star/task/XJob.hpp>
 
 namespace beans = com::sun::star::beans ;
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index 81bdee096fa2..ae0e59670aec 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -19,48 +19,48 @@
 
 
 #include "updatehdl.hxx"
-#include "helpids.h"
+#include <helpids.h>
 
-#include "osl/diagnose.h"
-#include "osl/thread.hxx"
-#include "osl/file.hxx"
-#include "rtl/ustring.hxx"
-#include "rtl/bootstrap.hxx"
+#include <osl/diagnose.h>
+#include <osl/thread.hxx>
+#include <osl/file.hxx>
+#include <rtl/ustring.hxx>
+#include <rtl/bootstrap.hxx>
 
-#include "com/sun/star/uno/Sequence.h"
+#include <com/sun/star/uno/Sequence.h>
 
 #include <com/sun/star/style/VerticalAlignment.hpp>
 
-#include "com/sun/star/awt/ActionEvent.hpp"
-#include "com/sun/star/awt/PushButtonType.hpp"
-#include "com/sun/star/awt/UnoControlDialog.hpp"
-#include "com/sun/star/awt/VclWindowPeerAttribute.hpp"
-#include "com/sun/star/awt/WindowAttribute.hpp"
-#include "com/sun/star/awt/XButton.hpp"
-#include "com/sun/star/awt/XControl.hpp"
-#include "com/sun/star/awt/XControlContainer.hpp"
-#include "com/sun/star/awt/XMessageBox.hpp"
-#include "com/sun/star/awt/XAnimation.hpp"
-#include "com/sun/star/awt/XTopWindow.hpp"
-#include "com/sun/star/awt/XVclWindowPeer.hpp"
-#include "com/sun/star/awt/XVclContainer.hpp"
-#include "com/sun/star/awt/XWindow.hpp"
-#include "com/sun/star/awt/XWindow2.hpp"
+#include <com/sun/star/awt/ActionEvent.hpp>
+#include <com/sun/star/awt/PushButtonType.hpp>
+#include <com/sun/star/awt/UnoControlDialog.hpp>
+#include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
+#include <com/sun/star/awt/WindowAttribute.hpp>
+#include <com/sun/star/awt/XButton.hpp>
+#include <com/sun/star/awt/XControl.hpp>
+#include <com/sun/star/awt/XControlContainer.hpp>
+#include <com/sun/star/awt/XMessageBox.hpp>
+#include <com/sun/star/awt/XAnimation.hpp>
+#include <com/sun/star/awt/XTopWindow.hpp>
+#include <com/sun/star/awt/XVclWindowPeer.hpp>
+#include <com/sun/star/awt/XVclContainer.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/awt/XWindow2.hpp>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include "com/sun/star/beans/XPropertySet.hpp"
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 
-#include "com/sun/star/container/XNameContainer.hpp"
+#include <com/sun/star/container/XNameContainer.hpp>
 
-#include "com/sun/star/frame/Desktop.hpp"
-#include "com/sun/star/frame/TerminationVetoException.hpp"
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "com/sun/star/task/InteractionHandler.hpp"
-#include "com/sun/star/task/InteractionRequestStringResolver.hpp"
+#include <com/sun/star/frame/Desktop.hpp>
+#include <com/sun/star/frame/TerminationVetoException.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/task/InteractionHandler.hpp>
+#include <com/sun/star/task/InteractionRequestStringResolver.hpp>
 
-#include "strings.hrc"
+#include <strings.hrc>
 #include <unotools/resmgr.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/settings.hxx>
diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx
index ee58d026e7d8..519669ebfb48 100644
--- a/extensions/source/update/check/updatehdl.hxx
+++ b/extensions/source/update/check/updatehdl.hxx
@@ -21,16 +21,16 @@
 #define INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATEHDL_HXX
 
 #include <osl/mutex.hxx>
-#include "com/sun/star/uno/Any.h"
-#include "com/sun/star/uno/Reference.h"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/awt/Rectangle.hpp"
-#include "com/sun/star/awt/XActionListener.hpp"
-#include "com/sun/star/awt/XControlModel.hpp"
-#include "com/sun/star/awt/XDialog.hpp"
-#include "com/sun/star/awt/XTopWindowListener.hpp"
-#include "com/sun/star/beans/NamedValue.hpp"
-#include "com/sun/star/frame/XTerminateListener.hpp"
+#include <com/sun/star/uno/Any.h>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/XActionListener.hpp>
+#include <com/sun/star/awt/XControlModel.hpp>
+#include <com/sun/star/awt/XDialog.hpp>
+#include <com/sun/star/awt/XTopWindowListener.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/frame/XTerminateListener.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <cppuhelper/implbase.hxx>
 
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 28c092c76a81..a7daf0ef708e 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/ucb/XCommandProcessor2.hpp>
 #include <com/sun/star/ucb/XContentIdentifierFactory.hpp>
 #include <com/sun/star/ucb/XContentProvider.hpp>
-#include "com/sun/star/ucb/XInteractionSupplyAuthentication.hpp"
+#include <com/sun/star/ucb/XInteractionSupplyAuthentication.hpp>
 #include <com/sun/star/ucb/OpenCommandArgument3.hpp>
 #include <com/sun/star/ucb/OpenMode.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 498fc0e17304..cdd17d77433d 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -47,9 +47,9 @@
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/strings.hrc>
-#include "rtl/ustrbuf.hxx"
+#include <rtl/ustrbuf.hxx>
 
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 #define PROPERTY_TITLE          "BubbleHeading"
 #define PROPERTY_TEXT           "BubbleText"