loplugin:includeform: desktop

Change-Id: I2dacb21cd0c9618dadb49912e0f09c9ab576f9b0

78 files changed, 215 insertions, 215 deletions

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 56850c64e29b..e1db2cbd9b77 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -29,16 +29,16 @@
 #include <signal.h>
 #endif
 
-#include "app.hxx"
-#include "dp_shared.hxx"
-#include "strings.hrc"
+#include <app.hxx>
+#include <dp_shared.hxx>
+#include <strings.hrc>
 #include "cmdlineargs.hxx"
 #include "cmdlinehelp.hxx"
 #include "dispatchwatcher.hxx"
-#include "lockfile.hxx"
+#include <lockfile.hxx>
 #include "userinstall.hxx"
 #include "desktopcontext.hxx"
-#include "migration.hxx"
+#include <migration.hxx>
 #if HAVE_FEATURE_UPDATE_MAR
 #include "updater.hxx"
 #endif
@@ -149,7 +149,7 @@
 #define GETPID getpid
 #endif
 
-#include "strings.hxx"
+#include <strings.hxx>
 
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::uno;
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index b21b98349b7f..853eaf8734ae 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -22,10 +22,10 @@
 
 #include <config_vclplug.h>
 
-#include "app.hxx"
-#include "dp_shared.hxx"
+#include <app.hxx>
+#include <dp_shared.hxx>
 #include "cmdlineargs.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 #include <com/sun/star/registry/XSimpleRegistry.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index 86f6385cf4ab..0fb8a9aa60bd 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -56,9 +56,9 @@
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 
-#include "app.hxx"
+#include <app.hxx>
 
-#include "dp_misc.h"
+#include <dp_misc.h>
 
 using namespace desktop;
 using namespace com::sun::star;
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 466e6eeeae11..f4dff56bb700 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -26,7 +26,7 @@
 #include <sfx2/app.hxx>
 #include <svl/fstathelper.hxx>
 
-#include "app.hxx"
+#include <app.hxx>
 #include "dispatchwatcher.hxx"
 #include <rtl/ustring.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index 8d826ab3674e..4ce877a3d926 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -30,15 +30,15 @@
 #include <i18nlangtag/lang.h>
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nlangtag/mslangid.hxx>
-#include "officecfg/Office/Linguistic.hxx"
-#include "officecfg/Setup.hxx"
-#include "officecfg/System.hxx"
+#include <officecfg/Office/Linguistic.hxx>
+#include <officecfg/Setup.hxx>
+#include <officecfg/System.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 #include <sal/types.h>
 #include <svl/languageoptions.hxx>
 
-#include "app.hxx"
+#include <app.hxx>
 
 #include "cmdlineargs.hxx"
 #include "langselect.hxx"
diff --git a/desktop/source/app/lockfile2.cxx b/desktop/source/app/lockfile2.cxx
index 42f3081fb7d5..31911f561719 100644
--- a/desktop/source/app/lockfile2.cxx
+++ b/desktop/source/app/lockfile2.cxx
@@ -19,10 +19,10 @@
 
 
 #include <vcl/layout.hxx>
-#include "dp_shared.hxx"
-#include "strings.hrc"
+#include <dp_shared.hxx>
+#include <strings.hrc>
 #include <tools/config.hxx>
-#include "lockfile.hxx"
+#include <lockfile.hxx>
 
 
 namespace desktop {
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index b0af939cffe1..bb597e665ff0 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -22,7 +22,7 @@
 #include <config_dbus.h>
 #include <config_features.h>
 
-#include "app.hxx"
+#include <app.hxx>
 #include "officeipcthread.hxx"
 #include "cmdlineargs.hxx"
 #include "dispatchwatcher.hxx"
diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
index 9f17673ed5e5..cb00a8720989 100644
--- a/desktop/source/app/opencl.cxx
+++ b/desktop/source/app/opencl.cxx
@@ -12,7 +12,7 @@
  * calculate using OpenCL.
  */
 
-#include "app.hxx"
+#include <app.hxx>
 
 #include <config_version.h>
 #include <config_features.h>
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 6ec3481a649b..657614962489 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -24,7 +24,7 @@
 
 #include <desktop/dllapi.h>
 
-#include "app.hxx"
+#include <app.hxx>
 #include "cmdlineargs.hxx"
 #include "cmdlinehelp.hxx"
 
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index ad55d6848f7a..bec53d861d59 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -23,8 +23,8 @@
 
 #include <com/sun/star/uno/Exception.hpp>
 #include <comphelper/configuration.hxx>
-#include "config_folders.h"
-#include "officecfg/Setup.hxx"
+#include <config_folders.h>
+#include <officecfg/Setup.hxx>
 #include <osl/file.h>
 #include <osl/file.hxx>
 #include <rtl/ustring.hxx>
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx
index c3de88643003..4f9453ff3a3b 100644
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include "dp_misc.h"
-#include "dp_services.hxx"
+#include <dp_misc.h>
+#include <dp_services.hxx>
 #include <rtl/strbuf.hxx>
 #include <osl/time.h>
 #include <osl/thread.h>
diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index b482ce79aaf9..5ca81c9a0b7b 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dp_misc.h"
-#include "dp_persmap.h"
+#include <dp_misc.h>
+#include <dp_persmap.h>
 #include <rtl/strbuf.hxx>
 
 using namespace ::rtl;
diff --git a/desktop/source/deployment/dp_xml.cxx b/desktop/source/deployment/dp_xml.cxx
index 72a5a8e78da3..31ebedc41643 100644
--- a/desktop/source/deployment/dp_xml.cxx
+++ b/desktop/source/deployment/dp_xml.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include "dp_misc.h"
-#include "dp_xml.h"
+#include <dp_misc.h>
+#include <dp_xml.h>
 #include <rtl/ustrbuf.hxx>
 #include <ucbhelper/content.hxx>
 #include <com/sun/star/xml/sax/Parser.hpp>
diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h
index 8f1820387c5c..494eae85939f 100644
--- a/desktop/source/deployment/gui/dp_gui.h
+++ b/desktop/source/deployment/gui/dp_gui.h
@@ -21,8 +21,8 @@
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_H
 
 #include "dp_gui_updatedata.hxx"
-#include "dp_misc.h"
-#include "strings.hrc"
+#include <dp_misc.h>
+#include <strings.hrc>
 #include <rtl/ref.hxx>
 #include <rtl/instance.hxx>
 #include <osl/thread.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
index a5720c7532a2..1dcdafd73bc9 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
@@ -26,9 +26,9 @@
 #include <rtl/ustring.hxx>
 #include <vcl/dialog.hxx>
 
-#include "strings.hrc"
+#include <strings.hrc>
 #include "dp_gui_dependencydialog.hxx"
-#include "dp_shared.hxx"
+#include <dp_shared.hxx>
 
 namespace vcl { class Window; }
 
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index b9969d90798f..5cfe53b22b25 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -17,24 +17,24 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "strings.hrc"
-#include "helpids.h"
+#include <strings.hrc>
+#include <helpids.h>
 #include <svtools/controldims.hxx>
 #include <svtools/strings.hrc>
 
 #include "dp_gui.h"
 #include "dp_gui_dialog2.hxx"
 #include "dp_gui_extlistbox.hxx"
-#include "dp_shared.hxx"
+#include <dp_shared.hxx>
 #include "dp_gui_theextmgr.hxx"
 #include "dp_gui_extensioncmdqueue.hxx"
-#include "dp_misc.h"
-#include "dp_ucb.h"
-#include "dp_update.hxx"
-#include "dp_identifier.hxx"
-#include "dp_descriptioninfoset.hxx"
+#include <dp_misc.h>
+#include <dp_ucb.h>
+#include <dp_update.hxx>
+#include <dp_identifier.hxx>
+#include <dp_descriptioninfoset.hxx>
 
-#include "fpicker/strings.hrc"
+#include <fpicker/strings.hrc>
 
 #include <vcl/ctrl.hxx>
 #include <vcl/menu.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 62f875e00d44..529fd8692e9a 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -69,13 +69,13 @@
 #include "dp_gui_extensioncmdqueue.hxx"
 #include "dp_gui_dependencydialog.hxx"
 #include "dp_gui_dialog2.hxx"
-#include "dp_shared.hxx"
+#include <dp_shared.hxx>
 #include "dp_gui_theextmgr.hxx"
 #include "dp_gui_updatedialog.hxx"
 #include "dp_gui_updateinstalldialog.hxx"
-#include "dp_dependencies.hxx"
-#include "dp_identifier.hxx"
-#include "dp_version.hxx"
+#include <dp_dependencies.hxx>
+#include <dp_identifier.hxx>
+#include <dp_version.hxx>
 
 #include <queue>
 #include <memory>
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 033fbf48bb77..1a1a32a6bfcc 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -19,13 +19,13 @@
 
 #include <svtools/controldims.hxx>
 
-#include "dp_shared.hxx"
+#include <dp_shared.hxx>
 #include "dp_gui.h"
 #include "dp_gui_extlistbox.hxx"
 #include "dp_gui_theextmgr.hxx"
 #include "dp_gui_dialog2.hxx"
-#include "dp_dependencies.hxx"
-#include "bitmaps.hlst"
+#include <dp_dependencies.hxx>
+#include <bitmaps.hlst>
 
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/i18n/CollatorOptions.hpp>
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index bf6061634d17..489a0dd8497f 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -19,7 +19,7 @@
 
 
 #include <memory>
-#include "dp_shared.hxx"
+#include <dp_shared.hxx>
 #include "dp_gui.h"
 #include "dp_gui_theextmgr.hxx"
 #include <cppuhelper/implbase.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index 137d2358a02c..b9dd8cd947f5 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -34,8 +34,8 @@
 #include "dp_gui_dialog2.hxx"
 #include "dp_gui_extensioncmdqueue.hxx"
 #include "dp_gui_theextmgr.hxx"
-#include "dp_identifier.hxx"
-#include "dp_update.hxx"
+#include <dp_identifier.hxx>
+#include <dp_update.hxx>
 
 #define USER_PACKAGE_MANAGER    "user"
 #define SHARED_PACKAGE_MANAGER  "shared"
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 3fd3a9b7398b..8fa20b8cd48e 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -97,19 +97,19 @@
 
 #include <comphelper/processfactory.hxx>
 
-#include "dp_dependencies.hxx"
-#include "dp_descriptioninfoset.hxx"
-#include "dp_identifier.hxx"
-#include "dp_version.hxx"
-#include "dp_misc.h"
-#include "dp_update.hxx"
+#include <dp_dependencies.hxx>
+#include <dp_descriptioninfoset.hxx>
+#include <dp_identifier.hxx>
+#include <dp_version.hxx>
+#include <dp_misc.h>
+#include <dp_update.hxx>
 
 #include "dp_gui.h"
-#include "strings.hrc"
-#include "bitmaps.hlst"
+#include <strings.hrc>
+#include <bitmaps.hlst>
 #include "dp_gui_updatedata.hxx"
 #include "dp_gui_updatedialog.hxx"
-#include "dp_shared.hxx"
+#include <dp_shared.hxx>
 
 class KeyEvent;
 class MouseEvent;
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 8c5775ce8691..fa80968521e1 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -52,13 +52,13 @@
 #include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/task/XInteractionApprove.hpp>
 
-#include "dp_descriptioninfoset.hxx"
-#include "strings.hrc"
+#include <dp_descriptioninfoset.hxx>
+#include <strings.hrc>
 #include "dp_gui_updateinstalldialog.hxx"
-#include "dp_shared.hxx"
-#include "dp_ucb.h"
-#include "dp_misc.h"
-#include "dp_version.hxx"
+#include <dp_shared.hxx>
+#include <dp_ucb.h>
+#include <dp_misc.h>
+#include <dp_version.hxx>
 #include "dp_gui_extensioncmdqueue.hxx"
 #include <ucbhelper/content.hxx>
 #include <rtl/ref.hxx>
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index f3e741324aff..6219d3ede3b2 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -34,9 +34,9 @@
 #include <vcl/threadex.hxx>
 #include <vcl/builderfactory.hxx>
 
-#include "dp_shared.hxx"
+#include <dp_shared.hxx>
 #include "license_dialog.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 
 #include <functional>
 
diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h
index b1aacd579de9..f6711d6d4d0a 100644
--- a/desktop/source/deployment/inc/dp_resource.h
+++ b/desktop/source/deployment/inc/dp_resource.h
@@ -21,7 +21,7 @@
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_RESOURCE_H
 
 #include <i18nlangtag/languagetag.hxx>
-#include "dp_misc.h"
+#include <dp_misc.h>
 #include "dp_misc_api.hxx"
 
 namespace dp_misc {
diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx
index e31f4650ed24..2f7993b9287a 100644
--- a/desktop/source/deployment/manager/dp_activepackages.cxx
+++ b/desktop/source/deployment/manager/dp_activepackages.cxx
@@ -33,7 +33,7 @@
 #include <rtl/uri.hxx>
 #include <rtl/ustring.hxx>
 
-#include "dp_identifier.hxx"
+#include <dp_identifier.hxx>
 #include "dp_activepackages.hxx"
 
 // Old format of database entry:
diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx
index b6b0b8b8e77f..286f9d801372 100644
--- a/desktop/source/deployment/manager/dp_activepackages.hxx
+++ b/desktop/source/deployment/manager/dp_activepackages.hxx
@@ -28,7 +28,7 @@
 #include <vector>
 
 #if HAVE_FEATURE_EXTENSIONS
-#include "dp_persmap.h"
+#include <dp_persmap.h>
 #endif
 
 
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 31acc903fa85..fad019f45cd7 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -48,12 +48,12 @@
 #include <xmlscript/xml_helper.hxx>
 #include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
-#include "dp_interact.h"
-#include "dp_resource.h"
-#include "dp_services.hxx"
-#include "dp_ucb.h"
-#include "dp_identifier.hxx"
-#include "dp_descriptioninfoset.hxx"
+#include <dp_interact.h>
+#include <dp_resource.h>
+#include <dp_services.hxx>
+#include <dp_ucb.h>
+#include <dp_identifier.hxx>
+#include <dp_descriptioninfoset.hxx>
 #include "dp_extensionmanager.hxx"
 #include "dp_commandenvironments.hxx"
 #include "dp_properties.hxx"
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index a2dd6bbbad30..b2315dd7d5fe 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_EXTENSIONMANAGER_HXX
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_EXTENSIONMANAGER_HXX
 
-#include "strings.hrc"
-#include "dp_misc.h"
-#include "dp_shared.hxx"
-#include "dp_interact.h"
+#include <strings.hrc>
+#include <dp_misc.h>
+#include <dp_shared.hxx>
+#include <dp_interact.h>
 #include "dp_activepackages.hxx"
 #include <rtl/ref.hxx>
 #include <cppuhelper/compbase.hxx>
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index 5aaee07a2194..81102f03fe53 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -40,13 +40,13 @@
 #include <rtl/ustring.hxx>
 #include <ucbhelper/content.hxx>
 
-#include "dp_dependencies.hxx"
-#include "dp_descriptioninfoset.hxx"
-#include "dp_identifier.hxx"
-#include "dp_services.hxx"
-#include "dp_version.hxx"
-#include "dp_misc.h"
-#include "dp_update.hxx"
+#include <dp_dependencies.hxx>
+#include <dp_descriptioninfoset.hxx>
+#include <dp_identifier.hxx>
+#include <dp_services.hxx>
+#include <dp_version.hxx>
+#include <dp_misc.h>
+#include <dp_update.hxx>
 
 namespace beans      = com::sun::star::beans ;
 namespace deployment = com::sun::star::deployment ;
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 5667ffc126fb..64d3debe423e 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -19,13 +19,13 @@
 
 #include <config_features.h>
 
-#include "dp_registry.hxx"
-#include "dp_shared.hxx"
-#include "dp_ucb.h"
-#include "dp_resource.h"
-#include "dp_platform.hxx"
+#include <dp_registry.hxx>
+#include <dp_shared.hxx>
+#include <dp_ucb.h>
+#include <dp_resource.h>
+#include <dp_platform.hxx>
 #include "dp_manager.h"
-#include "dp_identifier.hxx"
+#include <dp_identifier.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/string.hxx>
 #include <rtl/uri.hxx>
@@ -62,7 +62,7 @@
 #include <com/sun/star/ucb/UnsupportedCommandException.hpp>
 #include <unotools/tempfile.hxx>
 
-#include "dp_descriptioninfoset.hxx"
+#include <dp_descriptioninfoset.hxx>
 #include "dp_commandenvironments.hxx"
 #include "dp_properties.hxx"
 
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index 4e584a6e1d14..54b694c17d39 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_MANAGER_H
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_MANAGER_H
 
-#include "strings.hrc"
-#include "dp_misc.h"
-#include "dp_interact.h"
+#include <strings.hrc>
+#include <dp_misc.h>
+#include <dp_interact.h>
 #include "dp_activepackages.hxx"
 #include <rtl/ref.hxx>
 #include <cppuhelper/compbase.hxx>
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index 37089fc239ba..b04f751a69ff 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -19,8 +19,8 @@
 
 
 #include "dp_manager.h"
-#include "dp_resource.h"
-#include "dp_services.hxx"
+#include <dp_resource.h>
+#include <dp_services.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/servicedecl.hxx>
 #include <com/sun/star/deployment/thePackageManagerFactory.hpp>
diff --git a/desktop/source/deployment/manager/dp_properties.cxx b/desktop/source/deployment/manager/dp_properties.cxx
index 3ecab8aa169a..fb8f4ddb1a09 100644
--- a/desktop/source/deployment/manager/dp_properties.cxx
+++ b/desktop/source/deployment/manager/dp_properties.cxx
@@ -24,7 +24,7 @@
 #include <ucbhelper/content.hxx>
 #include <list>
 
-#include "dp_ucb.h"
+#include <dp_ucb.h>
 #include <rtl/ustrbuf.hxx>
 #include "dp_properties.hxx"
 
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index 1b858319f894..49b64780ec04 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -32,13 +32,13 @@
 #include <sal/types.h>
 #include <unotools/configmgr.hxx>
 
-#include "strings.hrc"
-#include "dp_resource.h"
-#include "dp_shared.hxx"
+#include <strings.hrc>
+#include <dp_resource.h>
+#include <dp_shared.hxx>
 
-#include "dp_dependencies.hxx"
-#include "dp_descriptioninfoset.hxx"
-#include "dp_version.hxx"
+#include <dp_dependencies.hxx>
+#include <dp_descriptioninfoset.hxx>
+#include <dp_version.hxx>
 
 namespace {
 
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index 3acd182a8ed8..1f0aa57443ec 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dp_descriptioninfoset.hxx"
+#include <dp_descriptioninfoset.hxx>
 
-#include "dp_resource.h"
+#include <dp_resource.h>
 #include <sal/config.h>
 
 #include <comphelper/sequence.hxx>
diff --git a/desktop/source/deployment/misc/dp_identifier.cxx b/desktop/source/deployment/misc/dp_identifier.cxx
index a0b922c008b1..2c429890d0e9 100644
--- a/desktop/source/deployment/misc/dp_identifier.cxx
+++ b/desktop/source/deployment/misc/dp_identifier.cxx
@@ -29,7 +29,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 
-#include "dp_identifier.hxx"
+#include <dp_identifier.hxx>
 
 namespace dp_misc {
 
diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx
index 0eda61153da6..2d0233b7cd90 100644
--- a/desktop/source/deployment/misc/dp_interact.cxx
+++ b/desktop/source/deployment/misc/dp_interact.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "dp_interact.h"
+#include <dp_interact.h>
 
 #include <comphelper/interaction.hxx>
 
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index aa996d426db9..39ca5ad87164 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -21,9 +21,9 @@
 #include <config_features.h>
 #include <chrono>
 
-#include "dp_misc.h"
-#include "dp_version.hxx"
-#include "dp_interact.h"
+#include <dp_misc.h>
+#include <dp_version.hxx>
+#include <dp_interact.h>
 #include <rtl/uri.hxx>
 #include <rtl/digest.h>
 #include <rtl/random.h>
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index 4bf885941cb7..f888c6da4a52 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include "dp_misc.h"
-#include "dp_platform.hxx"
+#include <dp_misc.h>
+#include <dp_platform.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/instance.hxx>
diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx
index 9a70ab218083..4f5671df9879 100644
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include "dp_misc.h"
-#include "dp_resource.h"
+#include <dp_misc.h>
+#include <dp_resource.h>
 #include <osl/module.hxx>
 #include <osl/mutex.hxx>
 #include <unotools/resmgr.hxx>
diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx
index c962c228f756..09de3711006f 100644
--- a/desktop/source/deployment/misc/dp_ucb.cxx
+++ b/desktop/source/deployment/misc/dp_ucb.cxx
@@ -18,9 +18,9 @@
  */
 
 
-#include "strings.hrc"
-#include "dp_misc.h"
-#include "dp_ucb.h"
+#include <strings.hrc>
+#include <dp_misc.h>
+#include <dp_ucb.h>
 #include <rtl/uri.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <ucbhelper/content.hxx>
diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx
index 828fdff2143f..e2785fb1b922 100644
--- a/desktop/source/deployment/misc/dp_update.cxx
+++ b/desktop/source/deployment/misc/dp_update.cxx
@@ -19,10 +19,10 @@
 
 #include <config_folders.h>
 
-#include "dp_update.hxx"
-#include "dp_version.hxx"
-#include "dp_identifier.hxx"
-#include "dp_descriptioninfoset.hxx"
+#include <dp_update.hxx>
+#include <dp_version.hxx>
+#include <dp_identifier.hxx>
+#include <dp_descriptioninfoset.hxx>
 
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <com/sun/star/ucb/CommandFailedException.hpp>
diff --git a/desktop/source/deployment/misc/dp_version.cxx b/desktop/source/deployment/misc/dp_version.cxx
index edf8b5147279..bdae36782730 100644
--- a/desktop/source/deployment/misc/dp_version.cxx
+++ b/desktop/source/deployment/misc/dp_version.cxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/deployment/XPackage.hpp>
 #include <rtl/ustring.hxx>
 
-#include "dp_version.hxx"
+#include <dp_version.hxx>
 
 namespace {
 
diff --git a/desktop/source/deployment/misc/lockfile.cxx b/desktop/source/deployment/misc/lockfile.cxx
index 0544f434bd14..219ccaf10431 100644
--- a/desktop/source/deployment/misc/lockfile.cxx
+++ b/desktop/source/deployment/misc/lockfile.cxx
@@ -39,7 +39,7 @@
 #include <unotools/bootstrap.hxx>
 #include <tools/config.hxx>
 
-#include "lockfile.hxx"
+#include <lockfile.hxx>
 
 using namespace ::osl;
 using namespace ::utl;
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
index dba37ae4db07..3cd455bd1875 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
 #include <com/sun/star/xml/xpath/XXPathAPI.hpp>
-#include "dp_misc.h"
+#include <dp_misc.h>
 
 #include "dp_compbackenddb.hxx"
 
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
index 7ed32c3d1fe0..02d03e1b206f 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
@@ -24,7 +24,7 @@
 #include <rtl/string.hxx>
 #include <vector>
 #include <list>
-#include "dp_backenddb.hxx"
+#include <dp_backenddb.hxx>
 
 namespace com { namespace sun { namespace star {
         namespace uno {
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 593815eac108..fca9e143d075 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -18,12 +18,12 @@
  */
 
 
-#include "strings.hrc"
-#include "dp_shared.hxx"
-#include "dp_backend.h"
-#include "dp_platform.hxx"
-#include "dp_services.hxx"
-#include "dp_ucb.h"
+#include <strings.hrc>
+#include <dp_shared.hxx>
+#include <dp_backend.h>
+#include <dp_platform.hxx>
+#include <dp_services.hxx>
+#include <dp_ucb.h>
 #include <rtl/string.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index cdf61b289ec7..499806e43895 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -22,12 +22,12 @@
 
 #include <config_features.h>
 
-#include "dp_backend.h"
+#include <dp_backend.h>
 #if HAVE_FEATURE_EXTENSIONS
-#include "dp_persmap.h"
+#include <dp_persmap.h>
 #endif
-#include "dp_services.hxx"
-#include "dp_ucb.h"
+#include <dp_services.hxx>
+#include <dp_ucb.h>
 #include <rtl/string.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/uri.hxx>
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
index 54c6f150fba8..b4b47a25260f 100644
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
 #include <com/sun/star/xml/xpath/XXPathAPI.hpp>
-#include "dp_misc.h"
+#include <dp_misc.h>
 
 #include "dp_configurationbackenddb.hxx"
 
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
index c09bff58512c..ce6443f12d7f 100644
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
@@ -24,7 +24,7 @@
 #include <rtl/string.hxx>
 #include <list>
 #include <boost/optional.hpp>
-#include "dp_backenddb.hxx"
+#include <dp_backenddb.hxx>
 
 namespace com { namespace sun { namespace star {
         namespace uno {
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 8bebe6cbec98..e9f31e266d79 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -21,8 +21,8 @@
 
 #include <cassert>
 
-#include "dp_backend.h"
-#include "dp_ucb.h"
+#include <dp_backend.h>
+#include <dp_ucb.h>
 #include <rtl/ustring.hxx>
 #include <rtl/uri.hxx>
 #include <rtl/bootstrap.hxx>
diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx
index 58f6e1137db5..e4329c90ed68 100644
--- a/desktop/source/deployment/registry/dp_backenddb.cxx
+++ b/desktop/source/deployment/registry/dp_backenddb.cxx
@@ -29,11 +29,11 @@
 #include <com/sun/star/xml/xpath/XPathAPI.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/io/XActiveDataControl.hpp>
-#include "dp_ucb.h"
-#include "dp_misc.h"
+#include <dp_ucb.h>
+#include <dp_misc.h>
 #include <ucbhelper/content.hxx>
 #include <xmlscript/xml_helper.hxx>
-#include "dp_backenddb.hxx"
+#include <dp_backenddb.hxx>
 
 
 using namespace ::com::sun::star::uno;
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index b3bad4b7fc0c..1350ba9dff72 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -19,14 +19,14 @@
 
 #include <sal/config.h>
 
-#include "dp_shared.hxx"
-#include "dp_package.hxx"
-#include "strings.hrc"
-#include "dp_registry.hxx"
-#include "dp_misc.h"
-#include "dp_resource.h"
-#include "dp_interact.h"
-#include "dp_ucb.h"
+#include <dp_shared.hxx>
+#include <dp_package.hxx>
+#include <strings.hrc>
+#include <dp_registry.hxx>
+#include <dp_misc.h>
+#include <dp_resource.h>
+#include <dp_interact.h>
+#include <dp_ucb.h>
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/uri.hxx>
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index e201461c2bfc..5f7eb30519d3 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -19,11 +19,11 @@
 
 
 #include <memory>
-#include "dp_misc.h"
-#include "dp_backend.h"
-#include "dp_services.hxx"
-#include "dp_ucb.h"
-#include "dp_interact.h"
+#include <dp_misc.h>
+#include <dp_backend.h>
+#include <dp_services.hxx>
+#include <dp_ucb.h>
+#include <dp_interact.h>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <rtl/string.hxx>
 #include <osl/file.hxx>
diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
index 81788563db5f..9e77c63854f9 100644
--- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
@@ -20,7 +20,7 @@
 
 #include <rtl/string.h>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include "dp_misc.h"
+#include <dp_misc.h>
 #include "dp_executablebackenddb.hxx"
 
 
diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
index 050b758dd025..2dc951c14ece 100644
--- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
+++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_EXECUTABLE_DP_EXECUTABLEBACKENDDB_HXX
 
 #include <rtl/ustring.hxx>
-#include "dp_backenddb.hxx"
+#include <dp_backenddb.hxx>
 
 namespace com { namespace sun { namespace star {
         namespace uno {
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 88b9e59f24c6..b0a8c2761743 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -20,11 +20,11 @@
 #include <memory>
 #include <config_features.h>
 
-#include "strings.hrc"
-#include "dp_backend.h"
+#include <strings.hrc>
+#include <dp_backend.h>
 #include "dp_helpbackenddb.hxx"
-#include "dp_services.hxx"
-#include "dp_ucb.h"
+#include <dp_services.hxx>
+#include <dp_ucb.h>
 #include <rtl/uri.hxx>
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
index 31ac496a1775..e91ea4b61de0 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
 #include <com/sun/star/xml/xpath/XXPathAPI.hpp>
-#include "dp_misc.h"
+#include <dp_misc.h>
 
 #include "dp_helpbackenddb.hxx"
 
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
index 0addaebe5e82..f11717272391 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
@@ -23,7 +23,7 @@
 #include <rtl/ustring.hxx>
 #include <list>
 #include <boost/optional.hpp>
-#include "dp_backenddb.hxx"
+#include <dp_backenddb.hxx>
 
 namespace com { namespace sun { namespace star {
         namespace uno {
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index 2115204c17b0..dfc62058a7bf 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_INC_DP_BACKEND_H
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_INC_DP_BACKEND_H
 
-#include "dp_misc.h"
-#include "dp_resource.h"
-#include "dp_shared.hxx"
-#include "dp_interact.h"
+#include <dp_misc.h>
+#include <dp_resource.h>
+#include <dp_shared.hxx>
+#include <dp_interact.h>
 #include <rtl/ref.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/implbase.hxx>
@@ -34,7 +34,7 @@
 #include <com/sun/star/deployment/InvalidRemovedParameterException.hpp>
 #include <list>
 #include <unordered_map>
-#include "strings.hrc"
+#include <strings.hrc>
 
 namespace dp_registry
 {
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
index e2c33b53d26d..375bf1290f2b 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
 #include <com/sun/star/xml/xpath/XXPathAPI.hpp>
-#include "dp_misc.h"
+#include <dp_misc.h>
 
 #include "dp_extbackenddb.hxx"
 
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
index 4b5b5e4fb601..1c220ff91485 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
@@ -25,7 +25,7 @@
 
 #include <rtl/ustring.hxx>
 
-#include "dp_backenddb.hxx"
+#include <dp_backenddb.hxx>
 
 namespace com { namespace sun { namespace star {
         namespace uno {
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index af12c6b09f3f..834505c4f0a8 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -18,15 +18,15 @@
  */
 
 
-#include "strings.hrc"
-#include "dp_package.hxx"
-#include "dp_backend.h"
-#include "dp_ucb.h"
-#include "dp_interact.h"
-#include "dp_dependencies.hxx"
-#include "dp_platform.hxx"
-#include "dp_descriptioninfoset.hxx"
-#include "dp_identifier.hxx"
+#include <strings.hrc>
+#include <dp_package.hxx>
+#include <dp_backend.h>
+#include <dp_ucb.h>
+#include <dp_interact.h>
+#include <dp_dependencies.hxx>
+#include <dp_platform.hxx>
+#include <dp_descriptioninfoset.hxx>
+#include <dp_identifier.hxx>
 #include <rtl/uri.hxx>
 #include <sal/log.hxx>
 #include <cppuhelper/exc_hlp.hxx>
diff --git a/desktop/source/deployment/registry/script/dp_lib_container.cxx b/desktop/source/deployment/registry/script/dp_lib_container.cxx
index 8843b04b6b0c..96ac2517caea 100644
--- a/desktop/source/deployment/registry/script/dp_lib_container.cxx
+++ b/desktop/source/deployment/registry/script/dp_lib_container.cxx
@@ -21,10 +21,10 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 
-#include "strings.hrc"
-#include "dp_resource.h"
-#include "dp_shared.hxx"
-#include "dp_xml.h"
+#include <strings.hrc>
+#include <dp_resource.h>
+#include <dp_shared.hxx>
+#include <dp_xml.h>
 #include "dp_lib_container.h"
 
 #include <rtl/ustring.hxx>
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index e806617845f2..f3e5998f214c 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -18,11 +18,11 @@
  */
 
 
-#include "strings.hrc"
-#include "dp_services.hxx"
+#include <strings.hrc>
+#include <dp_services.hxx>
 #include "dp_lib_container.h"
-#include "dp_backend.h"
-#include "dp_ucb.h"
+#include <dp_backend.h>
+#include <dp_ucb.h>
 #include <rtl/uri.hxx>
 #include <ucbhelper/content.hxx>
 #include <cppuhelper/exc_hlp.hxx>
diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
index 8c288d9b5755..4c1690cf1d73 100644
--- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
+++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/dom/XDocument.hpp>
 #include <com/sun/star/xml/xpath/XXPathAPI.hpp>
-#include "dp_misc.h"
+#include <dp_misc.h>
 #include "dp_scriptbackenddb.hxx"
 
 
diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
index aee78da3642b..2136e4454a87 100644
--- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
+++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_SCRIPT_DP_SCRIPTBACKENDDB_HXX
 
 #include <rtl/ustring.hxx>
-#include "dp_backenddb.hxx"
+#include <dp_backenddb.hxx>
 #include <boost/optional.hpp>
 
 namespace com { namespace sun { namespace star {
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
index 1c86b0983b95..653d0a1a9d67 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dp_misc.h"
+#include <dp_misc.h>
 #include "dp_parceldesc.hxx"
 
 
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index d5a8a5df2843..49dd1ae14d09 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -19,10 +19,10 @@
 
 #include <sal/config.h>
 
-#include "dp_services.hxx"
-#include "strings.hrc"
-#include "dp_backend.h"
-#include "dp_ucb.h"
+#include <dp_services.hxx>
+#include <strings.hrc>
+#include <dp_backend.h>
+#include <dp_ucb.h>
 #include "dp_parceldesc.hxx"
 #include <rtl/uri.hxx>
 #include <ucbhelper/content.hxx>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b731f08fb426..01b2e9347596 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -103,7 +103,7 @@
 #include <lib/init.hxx>
 
 #include "lokinteractionhandler.hxx"
-#include <lokclipboard.hxx>
+#include "lokclipboard.hxx"
 
 using namespace css;
 using namespace vcl;
diff --git a/desktop/source/lib/lokclipboard.cxx b/desktop/source/lib/lokclipboard.cxx
index d218e691c72a..592bd29af608 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <lokclipboard.hxx>
+#include "lokclipboard.hxx"
 #include <comphelper/sequence.hxx>
 
 using namespace com::sun::star;
diff --git a/desktop/source/lib/lokinteractionhandler.cxx b/desktop/source/lib/lokinteractionhandler.cxx
index 924cc61a14bc..96d35a235efc 100644
--- a/desktop/source/lib/lokinteractionhandler.cxx
+++ b/desktop/source/lib/lokinteractionhandler.cxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/task/DocumentPasswordRequest2.hpp>
 #include <com/sun/star/task/DocumentMSPasswordRequest2.hpp>
 
-#include <../../inc/lib/init.hxx>
+#include "../../inc/lib/init.hxx"
 
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <sfx2/lokhelper.hxx>
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index e03a103766bd..043fe62e6c8d 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -25,7 +25,7 @@
 #include <new>
 #include <set>
 
-#include "migration.hxx"
+#include <migration.hxx>
 #include "migration_impl.hxx"
 
 #include <sal/log.hxx>
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index a15421ee6ad7..70ff0000b9cb 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -24,7 +24,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "migration.hxx"
+#include <migration.hxx>
 
 #include <sal/types.h>
 #include <rtl/string.hxx>
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index a928a7e3c336..d3cc0e89d41d 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -19,10 +19,10 @@
 
 
 #include <desktop/dllapi.h>
-#include "dp_misc.h"
+#include <dp_misc.h>
 #include "unopkg_main.h"
 #include "unopkg_shared.h"
-#include "dp_identifier.hxx"
+#include <dp_identifier.hxx>
 #include <tools/extendapplicationenvironment.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/uri.hxx>
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index 49e2274b0056..a9eb2cdb1488 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include "strings.hrc"
-#include "dp_shared.hxx"
+#include <strings.hrc>
+#include <dp_shared.hxx>
 #include "unopkg_shared.h"
 #include <osl/thread.h>
 #include <unotools/resmgr.hxx>
@@ -40,7 +40,7 @@
 #include <com/sun/star/i18n/CollatorOptions.hpp>
 
 #include <stdio.h>
-#include "dp_version.hxx"
+#include <dp_version.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::ucb;
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 0aafe484a21d..2955757f4a19 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -38,11 +38,11 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ucb/UniversalContentBroker.hpp>
 
-#include "strings.hrc"
+#include <strings.hrc>
 #include "unopkg_shared.h"
-#include "dp_identifier.hxx"
-#include "dp_shared.hxx"
-#include "lockfile.hxx"
+#include <dp_identifier.hxx>
+#include <dp_shared.hxx>
+#include <lockfile.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h
index 7a3e51f41e8f..0028880b16aa 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_shared.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dp_misc.h"
+#include <dp_misc.h>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>