fixincludeguards.sh: desktop

Change-Id: Iaeba85d313af1840f925fd0536d11ac83545a118

47 files changed, 105 insertions, 105 deletions

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index d01e9643f16e..31d0daee9589 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DESKTOP_APP_HXX_
-#define _DESKTOP_APP_HXX_
+#ifndef INCLUDED_DESKTOP_INC_APP_HXX
+#define INCLUDED_DESKTOP_INC_APP_HXX
 
 // stl includes first
 #include <map>
@@ -192,6 +192,6 @@ class Desktop : public Application
 
 }
 
-#endif // _DESKTOP_APP_HXX_
+#endif // INCLUDED_DESKTOP_INC_APP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/inc/liblibreoffice.hxx b/desktop/inc/liblibreoffice.hxx
index 1dc2ede120ba..28c23476c899 100644
--- a/desktop/inc/liblibreoffice.hxx
+++ b/desktop/inc/liblibreoffice.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _LIBLIBREOFFICE_HXX
-#define _LIBLIBREOFFICE_HXX
+#ifndef INCLUDED_DESKTOP_INC_LIBLIBREOFFICE_HXX
+#define INCLUDED_DESKTOP_INC_LIBLIBREOFFICE_HXX
 
 class LODocument
 {
diff --git a/desktop/inc/migration.hxx b/desktop/inc/migration.hxx
index 6f382b8ba4fd..cb73bdd42eb5 100644
--- a/desktop/inc/migration.hxx
+++ b/desktop/inc/migration.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DESKTOP_MIGRATION_HXX_
-#define _DESKTOP_MIGRATION_HXX_
+#ifndef INCLUDED_DESKTOP_INC_MIGRATION_HXX
+#define INCLUDED_DESKTOP_INC_MIGRATION_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx
index 099bc251f7f3..ad265c91926a 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DESKTOP_COMMANDLINEARGS_HXX_
-#define _DESKTOP_COMMANDLINEARGS_HXX_
+#ifndef INCLUDED_DESKTOP_SOURCE_APP_CMDLINEARGS_HXX
+#define INCLUDED_DESKTOP_SOURCE_APP_CMDLINEARGS_HXX
 
 #include "sal/config.h"
 
diff --git a/desktop/source/app/cmdlinehelp.hxx b/desktop/source/app/cmdlinehelp.hxx
index 88ea0733f995..2a3bda797896 100644
--- a/desktop/source/app/cmdlinehelp.hxx
+++ b/desktop/source/app/cmdlinehelp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DESKTOP_COMMANDLINEHELP_HXX_
-#define _DESKTOP_COMMANDLINEHELP_HXX_
+#ifndef INCLUDED_DESKTOP_SOURCE_APP_CMDLINEHELP_HXX
+#define INCLUDED_DESKTOP_SOURCE_APP_CMDLINEHELP_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
diff --git a/desktop/source/app/configinit.hxx b/desktop/source/app/configinit.hxx
index 250e3ae3e4fa..3c2cb5381708 100644
--- a/desktop/source/app/configinit.hxx
+++ b/desktop/source/app/configinit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DESKTOP_CONFIGINIT_HXX_
-#define _DESKTOP_CONFIGINIT_HXX_
+#ifndef INCLUDED_DESKTOP_SOURCE_APP_CONFIGINIT_HXX
+#define INCLUDED_DESKTOP_SOURCE_APP_CONFIGINIT_HXX
 
 #include "sal/config.h"
 
diff --git a/desktop/source/app/desktopcontext.hxx b/desktop/source/app/desktopcontext.hxx
index 252a2c7b57b5..e31f72c573d0 100644
--- a/desktop/source/app/desktopcontext.hxx
+++ b/desktop/source/app/desktopcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DESKTOP_DESKTOPCONTEXT_HXX_
-#define _DESKTOP_DESKTOPCONTEXT_HXX_
+#ifndef INCLUDED_DESKTOP_SOURCE_APP_DESKTOPCONTEXT_HXX
+#define INCLUDED_DESKTOP_SOURCE_APP_DESKTOPCONTEXT_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <uno/current_context.hxx>
@@ -39,6 +39,6 @@ namespace desktop
     };
 }
 
-#endif // _DESKTOP_DESKTOPCONTEXT_HXX_
+#endif // INCLUDED_DESKTOP_SOURCE_APP_DESKTOPCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/desktopresid.hxx b/desktop/source/app/desktopresid.hxx
index c9873f618e92..d07df7e88906 100644
--- a/desktop/source/app/desktopresid.hxx
+++ b/desktop/source/app/desktopresid.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DESKTOP_RESID_HXX_
-#define _DESKTOP_RESID_HXX_
+#ifndef INCLUDED_DESKTOP_SOURCE_APP_DESKTOPRESID_HXX
+#define INCLUDED_DESKTOP_SOURCE_APP_DESKTOPRESID_HXX
 
 #include <tools/resid.hxx>
 
@@ -33,6 +33,6 @@ class DesktopResId : public ResId
 
 }
 
-#endif // _DESKTOP_RESID_HXX_
+#endif // INCLUDED_DESKTOP_SOURCE_APP_DESKTOPRESID_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index 8a0468ee5acc..d4c11508aa69 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DESKTOP_DISPATCHWATCHER_HXX
-#define _DESKTOP_DISPATCHWATCHER_HXX
+#ifndef INCLUDED_DESKTOP_SOURCE_APP_DISPATCHWATCHER_HXX
+#define INCLUDED_DESKTOP_SOURCE_APP_DISPATCHWATCHER_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/frame/XNotifyingDispatch.hpp>
@@ -106,6 +106,6 @@ class DispatchWatcher : public ::cppu::WeakImplHelper1< ::com::sun::star::frame:
 
 }
 
-#endif // _DESKTOP_DISPATCHWATCHER_HXX
+#endif // INCLUDED_DESKTOP_SOURCE_APP_DISPATCHWATCHER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index a17e11681722..ff84933e744a 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DESKTOP_OFFICEIPCTHREAD_HXX_
-#define _DESKTOP_OFFICEIPCTHREAD_HXX_
+#ifndef INCLUDED_DESKTOP_SOURCE_APP_OFFICEIPCTHREAD_HXX
+#define INCLUDED_DESKTOP_SOURCE_APP_OFFICEIPCTHREAD_HXX
 
 #include "sal/config.h"
 
@@ -159,6 +159,6 @@ class OfficeIPCThreadController : public ::cppu::WeakImplHelper2<
 
 }
 
-#endif // _DESKTOP_OFFICEIPCTHREAD_HXX_
+#endif // INCLUDED_DESKTOP_SOURCE_APP_OFFICEIPCTHREAD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/descedit.hxx b/desktop/source/deployment/gui/descedit.hxx
index a7a7b0cf2cbb..f57d91cbc5a1 100644
--- a/desktop/source/deployment/gui/descedit.hxx
+++ b/desktop/source/deployment/gui/descedit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DESCEDIT_HXX
-#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DESCEDIT_HXX
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DESCEDIT_HXX
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DESCEDIT_HXX
 
 #include "svtools/svmedit2.hxx"
 
@@ -43,6 +43,6 @@ namespace dp_gui
 
 } // namespace dp_gui
 
-#endif // INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DESCEDIT_HXX
+#endif // INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DESCEDIT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h
index ff4187f4f3b8..4a09cc36a265 100644
--- a/desktop/source/deployment/gui/dp_gui.h
+++ b/desktop/source/deployment/gui/dp_gui.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_GUI_H
-#define INCLUDED_DP_GUI_H
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_H
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_H
 
 #include "dp_gui_updatedata.hxx"
 #include "dp_misc.h"
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 99890173330b..369f99b8cc8b 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_GUI_DIALOG2_HXX
-#define INCLUDED_DP_GUI_DIALOG2_HXX
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DIALOG2_HXX
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DIALOG2_HXX
 
 #include "vcl/dialog.hxx"
 #include "vcl/button.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
index 69a109caa237..a069f925aac2 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_GUI_EXTENSIONCMDQUEUE_HXX
-#define INCLUDED_DP_GUI_EXTENSIONCMDQUEUE_HXX
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_EXTENSIONCMDQUEUE_HXX
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_EXTENSIONCMDQUEUE_HXX
 
 #include "sal/config.h"
 
diff --git a/desktop/source/deployment/gui/dp_gui_shared.hxx b/desktop/source/deployment/gui/dp_gui_shared.hxx
index f407ed92ff46..94aa5db8bf05 100644
--- a/desktop/source/deployment/gui/dp_gui_shared.hxx
+++ b/desktop/source/deployment/gui/dp_gui_shared.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_GUI_SHARED_HXX
-#define INCLUDED_DP_GUI_SHARED_HXX
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX
 
 #include "rtl/instance.hxx"
 #include "tools/resmgr.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index df90ac4553d5..701fcca421cb 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_GUI_THEEXTMGR_HXX
-#define INCLUDED_DP_GUI_THEEXTMGR_HXX
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_THEEXTMGR_HXX
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_THEEXTMGR_HXX
 
 #include "comphelper/sequence.hxx"
 
diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
index fa688960573b..338873cd38ea 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_DP_GUI_UPDATEDATA_HXX
-#define INCLUDED_DP_GUI_UPDATEDATA_HXX
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATEDATA_HXX
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATEDATA_HXX
 
 #include "sal/config.h"
 #include "tools/solar.h"
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
index 4ff60064b5af..3a61fe033c03 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_INSTALLDIALOG_HXX
-#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_INSTALLDIALOG_HXX
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATEINSTALLDIALOG_HXX
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATEINSTALLDIALOG_HXX
 
 #include "sal/config.h"
 #include "vcl/button.hxx"
diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h
index 67bf480176fb..81038ec5c1b8 100644
--- a/desktop/source/deployment/inc/dp_interact.h
+++ b/desktop/source/deployment/inc/dp_interact.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_INTERACT_H
-#define INCLUDED_DP_INTERACT_H
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_INTERACT_H
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_INTERACT_H
 
 #include "rtl/ref.hxx"
 #include "cppuhelper/implbase1.hxx"
diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h
index 4ec4c6e34989..9c0921971712 100644
--- a/desktop/source/deployment/inc/dp_misc.h
+++ b/desktop/source/deployment/inc/dp_misc.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_MISC_H
-#define INCLUDED_DP_MISC_H
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_MISC_H
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_MISC_H
 
 #include "rtl/ustrbuf.hxx"
 #include "rtl/instance.hxx"
diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h
index efc5c24145dd..aa978434b168 100644
--- a/desktop/source/deployment/inc/dp_persmap.h
+++ b/desktop/source/deployment/inc/dp_persmap.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_PERSMAP_H
-#define INCLUDED_DP_PERSMAP_H
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_PERSMAP_H
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_PERSMAP_H
 
 #include <rtl/ustring.hxx>
 #include <osl/file.hxx>
diff --git a/desktop/source/deployment/inc/dp_platform.hxx b/desktop/source/deployment/inc/dp_platform.hxx
index 18ca77efda50..8018e2f9de4b 100644
--- a/desktop/source/deployment/inc/dp_platform.hxx
+++ b/desktop/source/deployment/inc/dp_platform.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_PLATFORM_HXX
-#define INCLUDED_DP_PLATFORM_HXX
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_PLATFORM_HXX
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_PLATFORM_HXX
 
 
 #include "dp_misc_api.hxx"
diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h
index f5a62117b219..8602df2e4b13 100644
--- a/desktop/source/deployment/inc/dp_resource.h
+++ b/desktop/source/deployment/inc/dp_resource.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_RESOURCE_H
-#define INCLUDED_DP_RESOURCE_H
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_RESOURCE_H
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_RESOURCE_H
 
 #include "tools/resid.hxx"
 #include <i18nlangtag/languagetag.hxx>
diff --git a/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h
index 824d32d367dd..32f8cd4d008b 100644
--- a/desktop/source/deployment/inc/dp_ucb.h
+++ b/desktop/source/deployment/inc/dp_ucb.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_UCB_H
-#define INCLUDED_DP_UCB_H
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_UCB_H
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_UCB_H
 
 #include <list>
 #include "rtl/byteseq.hxx"
diff --git a/desktop/source/deployment/inc/dp_update.hxx b/desktop/source/deployment/inc/dp_update.hxx
index 4f50d5c34812..726e08791ead 100644
--- a/desktop/source/deployment/inc/dp_update.hxx
+++ b/desktop/source/deployment/inc/dp_update.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_UPDATE_HXX
-#define INCLUDED_DP_UPDATE_HXX
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_UPDATE_HXX
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_UPDATE_HXX
 
 
 #include "com/sun/star/deployment/XPackage.hpp"
diff --git a/desktop/source/deployment/inc/dp_xml.h b/desktop/source/deployment/inc/dp_xml.h
index 607c717c9307..d32b8a152c43 100644
--- a/desktop/source/deployment/inc/dp_xml.h
+++ b/desktop/source/deployment/inc/dp_xml.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_XML_H
-#define INCLUDED_DP_XML_H
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_XML_H
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_XML_H
 
 #include "rtl/ref.hxx"
 #include "rtl/ustrbuf.hxx"
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx
index 0780dfab3382..ae50fa00426c 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.hxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_COMMANDENVIRONMENTS_HXX
-#define INCLUDED_DP_COMMANDENVIRONMENTS_HXX
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_COMMANDENVIRONMENTS_HXX
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_COMMANDENVIRONMENTS_HXX
 
 #include "cppuhelper/compbase3.hxx"
 #include "ucbhelper/content.hxx"
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index b23bf901b490..d64ef6b0a55c 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_EXTENSIONMANAGER_H
-#define INCLUDED_DP_EXTENSIONMANAGER_H
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_EXTENSIONMANAGER_HXX
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_EXTENSIONMANAGER_HXX
 
 #include "dp_manager.hrc"
 #include "dp_misc.h"
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index 91802135c83a..4af638c73b49 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_MANAGER_H
-#define INCLUDED_DP_MANAGER_H
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_MANAGER_H
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_MANAGER_H
 
 #include "dp_manager.hrc"
 #include "dp_misc.h"
diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx
index 983ddfc6075c..da72e8e11a58 100644
--- a/desktop/source/deployment/manager/dp_properties.hxx
+++ b/desktop/source/deployment/manager/dp_properties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_PROPERTIES_HXX
-#define INCLUDED_DP_PROPERTIES_HXX
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_PROPERTIES_HXX
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_PROPERTIES_HXX
 
 
 
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
index 39aeeacae3be..37a41a4b705a 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_COMPBACKENDDB_HXX
-#define INCLUDED_DP_COMPBACKENDDB_HXX
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_COMPONENT_DP_COMPBACKENDDB_HXX
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_COMPONENT_DP_COMPBACKENDDB_HXX
 
 #include "rtl/ustring.hxx"
 #include "rtl/string.hxx"
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
index 31a444bea994..5605b7a7a9f8 100644
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_CONFIGURATIONBACKENDDB_HXX
-#define INCLUDED_DP_CONFIGURATIONBACKENDDB_HXX
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_CONFIGURATION_DP_CONFIGURATIONBACKENDDB_HXX
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_CONFIGURATION_DP_CONFIGURATIONBACKENDDB_HXX
 
 #include "rtl/ustring.hxx"
 #include "rtl/string.hxx"
diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
index 10d094fbeec3..d2c8061408c3 100644
--- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
+++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_EXECUTABLEBACKENDDB_HXX
-#define INCLUDED_DP_EXECUTABLEBACKENDDB_HXX
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_EXECUTABLE_DP_EXECUTABLEBACKENDDB_HXX
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_EXECUTABLE_DP_EXECUTABLEBACKENDDB_HXX
 
 #include "rtl/ustring.hxx"
 #include "dp_backenddb.hxx"
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
index e6f6af82914e..55e2b73d55c2 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_HELPBACKENDDB_HXX
-#define INCLUDED_DP_HELPBACKENDDB_HXX
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_HELP_DP_HELPBACKENDDB_HXX
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_HELP_DP_HELPBACKENDDB_HXX
 
 #include "rtl/ustring.hxx"
 #include <list>
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index 621320852770..f0e29fb0a420 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_REGISTRY_H
-#define INCLUDED_DP_REGISTRY_H
+#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"
diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
index 09ae83f95fb1..6c8091fc31dc 100644
--- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx
+++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_BACKENDDB_HXX
-#define INCLUDED_DP_BACKENDDB_HXX
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_INC_DP_BACKENDDB_HXX
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_INC_DP_BACKENDDB_HXX
 
 #include "rtl/ustring.hxx"
 #include <list>
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
index da8324219f52..36c55f56350b 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_EXTBACKENDDB_HXX
-#define INCLUDED_DP_EXTBACKENDDB_HXX
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_PACKAGE_DP_EXTBACKENDDB_HXX
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_PACKAGE_DP_EXTBACKENDDB_HXX
 
 #include <utility>
 #include <vector>
diff --git a/desktop/source/deployment/registry/script/dp_lib_container.h b/desktop/source/deployment/registry/script/dp_lib_container.h
index 913f73ad3624..26b2ccdaabf9 100644
--- a/desktop/source/deployment/registry/script/dp_lib_container.h
+++ b/desktop/source/deployment/registry/script/dp_lib_container.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_LIB_CONTAINER_H
-#define INCLUDED_DP_LIB_CONTAINER_H
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_SCRIPT_DP_LIB_CONTAINER_H
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_SCRIPT_DP_LIB_CONTAINER_H
 
 #include <com/sun/star/uno/Reference.hxx>
 
diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
index ab196dbdbe0c..57e00bd735f5 100644
--- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
+++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_SCRIPTBACKENDDB_HXX
-#define INCLUDED_DP_SCRIPTBACKENDDB_HXX
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_SCRIPT_DP_SCRIPTBACKENDDB_HXX
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_SCRIPT_DP_SCRIPTBACKENDDB_HXX
 
 #include "rtl/ustring.hxx"
 #include "dp_backenddb.hxx"
diff --git a/desktop/source/inc/exithelper.h b/desktop/source/inc/exithelper.h
index e670da3bcab2..f92f1a867727 100644
--- a/desktop/source/inc/exithelper.h
+++ b/desktop/source/inc/exithelper.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DESKTOP_EXITHELPER_H_
-#define _DESKTOP_EXITHELPER_H_
+#ifndef INCLUDED_DESKTOP_SOURCE_INC_EXITHELPER_H
+#define INCLUDED_DESKTOP_SOURCE_INC_EXITHELPER_H
 
 enum EExitCodes {
     /* e.g. used to force showing of the command line help */
@@ -33,6 +33,6 @@ enum EExitCodes {
     EXITHELPER_NORMAL_RESTART = 81
 };
 
-#endif /* #ifndef _DESKTOP_EXITHELPER_H_ */
+#endif // INCLUDED_DESKTOP_SOURCE_INC_EXITHELPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index a92de8546f02..a45c6a0dd858 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _DESKTOP_MIGRATION_IMPL_HXX_
-#define _DESKTOP_MIGRATION_IMPL_HXX_
+#ifndef INCLUDED_DESKTOP_SOURCE_MIGRATION_MIGRATION_IMPL_HXX
+#define INCLUDED_DESKTOP_SOURCE_MIGRATION_MIGRATION_IMPL_HXX
 
 #include <vector>
 #include <algorithm>
diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx
index 56f3c7130008..5169c6eca100 100644
--- a/desktop/source/migration/services/basicmigration.hxx
+++ b/desktop/source/migration/services/basicmigration.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DESKTOP_BASICMIGRATION_HXX_
-#define _DESKTOP_BASICMIGRATION_HXX_
+#ifndef INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_BASICMIGRATION_HXX
+#define INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_BASICMIGRATION_HXX
 
 #include "misc.hxx"
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -91,6 +91,6 @@ namespace migration
 }   // namespace migration
 //.........................................................................
 
-#endif // _DESKTOP_BASICMIGRATION_HXX_
+#endif // INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_BASICMIGRATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/migration/services/misc.hxx b/desktop/source/migration/services/misc.hxx
index af69cb969981..46ad30b01cf9 100644
--- a/desktop/source/migration/services/misc.hxx
+++ b/desktop/source/migration/services/misc.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DESKTOP_MISC_HXX_
-#define _DESKTOP_MISC_HXX_
+#ifndef INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_MISC_HXX
+#define INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_MISC_HXX
 
 #include <rtl/ustring.hxx>
 
@@ -37,6 +37,6 @@ namespace migration
 }   // namespace migration
 //.........................................................................
 
-#endif // _DESKTOP_MISC_HXX_
+#endif // INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_MISC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx
index bcbc90638cf4..d76ad51e68a4 100644
--- a/desktop/source/migration/services/oo3extensionmigration.hxx
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DESKTOP_OO3EXTENSIONMIGRATION_HXX_
-#define _DESKTOP_OO3EXTENSIONMIGRATION_HXX_
+#ifndef INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_OO3EXTENSIONMIGRATION_HXX
+#define INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_OO3EXTENSIONMIGRATION_HXX
 
 #include "misc.hxx"
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -145,6 +145,6 @@ namespace migration
 }   // namespace migration
 //.........................................................................
 
-#endif // _DESKTOP_OO3EXTENSIONMIGRATION_HXX_
+#endif // INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_OO3EXTENSIONMIGRATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx
index 140800931ed8..9a731e5a4d67 100644
--- a/desktop/source/migration/services/wordbookmigration.hxx
+++ b/desktop/source/migration/services/wordbookmigration.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DESKTOP_WORDBOOKMIGRATION_HXX_
-#define _DESKTOP_WORDBOOKMIGRATION_HXX_
+#ifndef INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_WORDBOOKMIGRATION_HXX
+#define INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_WORDBOOKMIGRATION_HXX
 
 #include "misc.hxx"
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/desktop/unx/source/file_image.h b/desktop/unx/source/file_image.h
index f7fb7216f8db..736ef57c0810 100644
--- a/desktop/unx/source/file_image.h
+++ b/desktop/unx/source/file_image.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_FILE_IMAGE_H
-#define INCLUDED_FILE_IMAGE_H
+#ifndef INCLUDED_DESKTOP_UNX_SOURCE_FILE_IMAGE_H
+#define INCLUDED_DESKTOP_UNX_SOURCE_FILE_IMAGE_H
 
 #ifndef INCLUDED_STDDEF_H
 #include <stddef.h>
diff --git a/desktop/unx/source/splashx.h b/desktop/unx/source/splashx.h
index 90bba891dfa9..4b5fff1d7a6e 100644
--- a/desktop/unx/source/splashx.h
+++ b/desktop/unx/source/splashx.h
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef _SPLASHX_H
-#define _SPLASHX_H
+#ifndef INCLUDED_DESKTOP_UNX_SOURCE_SPLASHX_H
+#define INCLUDED_DESKTOP_UNX_SOURCE_SPLASHX_H
 
 
 #ifdef __cplusplus
@@ -24,6 +24,6 @@ void splash_draw_progress(struct splash* splash, int progess);
 } // extern "C"
 #endif
 
-#endif // _SPLASHX_H
+#endif // INCLUDED_DESKTOP_UNX_SOURCE_SPLASHX_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */