fixincludeguards.sh: shell

Change-Id: I987c54b15c271fc80b7efd25933e13950f974423

43 files changed, 89 insertions, 89 deletions

diff --git a/shell/inc/internal/basereader.hxx b/shell/inc/internal/basereader.hxx
index f7442f4939fc..def9292f2b5e 100644
--- a/shell/inc/internal/basereader.hxx
+++ b/shell/inc/internal/basereader.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef BASEREADER_HXX_INCLUDED
-#define BASEREADER_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_BASEREADER_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_BASEREADER_HXX
 
 #include "internal/global.hxx"
 #include "internal/types.hxx"
diff --git a/shell/inc/internal/columninfo.hxx b/shell/inc/internal/columninfo.hxx
index 6bea19f39837..4f67b05c539f 100644
--- a/shell/inc/internal/columninfo.hxx
+++ b/shell/inc/internal/columninfo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COLUMNINFO_HXX_INCLUDED
-#define COLUMNINFO_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_COLUMNINFO_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_COLUMNINFO_HXX
 
 #if defined _MSC_VER
 #pragma warning(push, 1)
diff --git a/shell/inc/internal/config.hxx b/shell/inc/internal/config.hxx
index 53052d3d6fd3..b2c543b2aff9 100644
--- a/shell/inc/internal/config.hxx
+++ b/shell/inc/internal/config.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONFIG_HXX_INCLUDED
-#define CONFIG_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_CONFIG_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_CONFIG_HXX
 
 #ifdef _MSC_VER
 #pragma warning (disable : 4786 4503 4917)
diff --git a/shell/inc/internal/contentreader.hxx b/shell/inc/internal/contentreader.hxx
index ef1671bc67db..8a1d7e4a1a72 100644
--- a/shell/inc/internal/contentreader.hxx
+++ b/shell/inc/internal/contentreader.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONTENTREADER_HXX_INCLUDED
-#define CONTENTREADER_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_CONTENTREADER_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_CONTENTREADER_HXX
 
 #include "internal/basereader.hxx"
 
diff --git a/shell/inc/internal/fileextensions.hxx b/shell/inc/internal/fileextensions.hxx
index 5fdc36fbfc18..f1c82833cad1 100644
--- a/shell/inc/internal/fileextensions.hxx
+++ b/shell/inc/internal/fileextensions.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FILEEXTENSIONS_HXX_INCLUDED
-#define FILEEXTENSIONS_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_FILEEXTENSIONS_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_FILEEXTENSIONS_HXX
 
 #include "internal/global.hxx"
 
diff --git a/shell/inc/internal/global.hxx b/shell/inc/internal/global.hxx
index bcad56ea7ef2..59696523a740 100644
--- a/shell/inc/internal/global.hxx
+++ b/shell/inc/internal/global.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef GLOBAL_HXX_INCLUDED
-#define GLOBAL_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_GLOBAL_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_GLOBAL_HXX
 
 #if defined _MSC_VER
 #pragma warning(push, 1)
diff --git a/shell/inc/internal/i_xml_parser_event_handler.hxx b/shell/inc/internal/i_xml_parser_event_handler.hxx
index 356c92130277..77db6321b7e7 100644
--- a/shell/inc/internal/i_xml_parser_event_handler.hxx
+++ b/shell/inc/internal/i_xml_parser_event_handler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef I_XML_PARSER_EVENT_HANDLER_HXX_INCLUDED
-#define I_XML_PARSER_EVENT_HANDLER_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_I_XML_PARSER_EVENT_HANDLER_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_I_XML_PARSER_EVENT_HANDLER_HXX
 
 #include <string>
 #include <map>
diff --git a/shell/inc/internal/infotips.hxx b/shell/inc/internal/infotips.hxx
index ee7bd1e82cfc..99eb76013933 100644
--- a/shell/inc/internal/infotips.hxx
+++ b/shell/inc/internal/infotips.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INFOTIPS_HXX_INCLUDED
-#define INFOTIPS_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_INFOTIPS_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_INFOTIPS_HXX
 
 #if defined _MSC_VER
 #pragma warning(push, 1)
diff --git a/shell/inc/internal/iso8601_converter.hxx b/shell/inc/internal/iso8601_converter.hxx
index 7f48efb42750..37be0edd20e0 100644
--- a/shell/inc/internal/iso8601_converter.hxx
+++ b/shell/inc/internal/iso8601_converter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef ISO8601_CONVERTER_HXX_INCLUDED
-#define ISO8601_CONVERTER_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_ISO8601_CONVERTER_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_ISO8601_CONVERTER_HXX
 
 #include <string>
 
diff --git a/shell/inc/internal/metainforeader.hxx b/shell/inc/internal/metainforeader.hxx
index 16dcfce6ca0c..fba67c4aa098 100644
--- a/shell/inc/internal/metainforeader.hxx
+++ b/shell/inc/internal/metainforeader.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef METAINFOREADER_HXX_INCLUDED
-#define METAINFOREADER_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_METAINFOREADER_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_METAINFOREADER_HXX
 
 #include "internal/basereader.hxx"
 #include "internal/types.hxx"
diff --git a/shell/inc/internal/propertyhdl.hxx b/shell/inc/internal/propertyhdl.hxx
index a46c0a91dc17..9d1b980e9218 100644
--- a/shell/inc/internal/propertyhdl.hxx
+++ b/shell/inc/internal/propertyhdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef PROPERTYHDL_HXX_INCLUDED
-#define PROPERTYHDL_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_PROPERTYHDL_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_PROPERTYHDL_HXX
 
 #if defined _MSC_VER
 #pragma warning(push, 1)
diff --git a/shell/inc/internal/propsheets.hxx b/shell/inc/internal/propsheets.hxx
index 08cd930de20e..b01df9e0ad1a 100644
--- a/shell/inc/internal/propsheets.hxx
+++ b/shell/inc/internal/propsheets.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef PROPSHEETS_HXX_INCLUDED
-#define PROPSHEETS_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_PROPSHEETS_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_PROPSHEETS_HXX
 
 #include "internal/metainforeader.hxx"
 
diff --git a/shell/inc/internal/registry.hxx b/shell/inc/internal/registry.hxx
index 0ab71f5cafdd..bd9ff7816d63 100644
--- a/shell/inc/internal/registry.hxx
+++ b/shell/inc/internal/registry.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef REGISTRY_HXX_INCLUDED
-#define REGISTRY_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_REGISTRY_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_REGISTRY_HXX
 
 //-----------------------------
 // registry helper functions
diff --git a/shell/inc/internal/resource.h b/shell/inc/internal/resource.h
index 3f98473736ae..5acc180ea3a2 100644
--- a/shell/inc/internal/resource.h
+++ b/shell/inc/internal/resource.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RESOURCE_H_INCLUDED
-#define RESOURCE_H_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_RESOURCE_H
+#define INCLUDED_SHELL_INC_INTERNAL_RESOURCE_H
 
 #define MANIFEST_RESOURCE_ID               2
 #define IDD_PROPPAGE_STATISTICS          101
diff --git a/shell/inc/internal/shlxthdl.hxx b/shell/inc/internal/shlxthdl.hxx
index be4023f68d4b..b972c57fa1c2 100644
--- a/shell/inc/internal/shlxthdl.hxx
+++ b/shell/inc/internal/shlxthdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SHLXTHDL_HXX_INCLUDED
-#define SHLXTHDL_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_SHLXTHDL_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_SHLXTHDL_HXX
 
 #if defined _MSC_VER
 #pragma warning(push, 1)
diff --git a/shell/inc/internal/stream_helper.hxx b/shell/inc/internal/stream_helper.hxx
index a7a48ab37982..306366d1741d 100644
--- a/shell/inc/internal/stream_helper.hxx
+++ b/shell/inc/internal/stream_helper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef STREAM_HELPER_HXX_INCLUDED
-#define STREAM_HELPER_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_STREAM_HELPER_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_STREAM_HELPER_HXX
 
 #include "internal/types.hxx"
 
diff --git a/shell/inc/internal/thumbviewer.hxx b/shell/inc/internal/thumbviewer.hxx
index a9f467efb86c..4d8ab686e570 100644
--- a/shell/inc/internal/thumbviewer.hxx
+++ b/shell/inc/internal/thumbviewer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef THUMBVIEWER_HXX_INCLUDED
-#define THUMBVIEWER_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_THUMBVIEWER_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_THUMBVIEWER_HXX
 
 #if defined _MSC_VER
 #pragma warning(push, 1)
diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx
index 8fc66d9e5d20..6823070ff958 100644
--- a/shell/inc/internal/types.hxx
+++ b/shell/inc/internal/types.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef TYPES_HXX_INCLUDED
-#define TYPES_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_TYPES_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_TYPES_HXX
 
 #include <string>
 #include <map>
diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx
index 8921671fb4e7..4d423e211134 100644
--- a/shell/inc/internal/utilities.hxx
+++ b/shell/inc/internal/utilities.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef UTILITIES_HXX_INCLUDED
-#define UTILITIES_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_UTILITIES_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_UTILITIES_HXX
 
 #include <malloc.h>
 #if defined _MSC_VER
diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/internal/xml_parser.hxx
index d91e8300109b..2d18ecadeb77 100644
--- a/shell/inc/internal/xml_parser.hxx
+++ b/shell/inc/internal/xml_parser.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XML_PARSER_HXX_
-#define _XML_PARSER_HXX_
+#ifndef INCLUDED_SHELL_INC_INTERNAL_XML_PARSER_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_XML_PARSER_HXX
 
 #include <expat.h>
 #include <stdexcept>
diff --git a/shell/inc/internal/zipfile.hxx b/shell/inc/internal/zipfile.hxx
index 0a78d9c339cb..15a900174419 100644
--- a/shell/inc/internal/zipfile.hxx
+++ b/shell/inc/internal/zipfile.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef ZIPFILE_HXX_INCLUDED
-#define ZIPFILE_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_INC_INTERNAL_ZIPFILE_HXX
+#define INCLUDED_SHELL_INC_INTERNAL_ZIPFILE_HXX
 
 #ifndef _WINDOWS
 #define _WINDOWS
diff --git a/shell/source/backends/macbe/macbackend.hxx b/shell/source/backends/macbe/macbackend.hxx
index 041e129cf8f8..386582d2e726 100644
--- a/shell/source/backends/macbe/macbackend.hxx
+++ b/shell/source/backends/macbe/macbackend.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MACBACKEND_HXX_
-#define _MACBACKEND_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_BACKENDS_MACBE_MACBACKEND_HXX
+#define INCLUDED_SHELL_SOURCE_BACKENDS_MACBE_MACBACKEND_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -126,6 +126,6 @@ protected:
     ~MacOSXBackend(void);
 };
 
-#endif // _MACBACKEND_HXX_
+#endif // INCLUDED_SHELL_SOURCE_BACKENDS_MACBE_MACBACKEND_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/cmdmail/cmdmailmsg.hxx b/shell/source/cmdmail/cmdmailmsg.hxx
index 24a3514d2aab..f2257fd86144 100644
--- a/shell/source/cmdmail/cmdmailmsg.hxx
+++ b/shell/source/cmdmail/cmdmailmsg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CMDMAILMSG_HXX_
-#define _CMDMAILMSG_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILMSG_HXX
+#define INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILMSG_HXX
 
 #include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
diff --git a/shell/source/cmdmail/cmdmailsuppl.hxx b/shell/source/cmdmail/cmdmailsuppl.hxx
index e72ebdb2dfd7..8c95ea099cd3 100644
--- a/shell/source/cmdmail/cmdmailsuppl.hxx
+++ b/shell/source/cmdmail/cmdmailsuppl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CMDMAILSUPPL_HXX_
-#define _CMDMAILSUPPL_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILSUPPL_HXX
+#define INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILSUPPL_HXX
 
 #include <cppuhelper/implbase3.hxx>
 #include <osl/mutex.hxx>
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
index e97f1f61958d..34570a1f56ad 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef SHELL_SESSIONINSTALL_SYNCDBUSSESSIONHELPER_HXX
-#define SHELL_SESSIONINSTALL_SYNCDBUSSESSIONHELPER_HXX
+#ifndef INCLUDED_SHELL_SOURCE_SESSIONINSTALL_SYNCDBUSSESSIONHELPER_HXX
+#define INCLUDED_SHELL_SOURCE_SESSIONINSTALL_SYNCDBUSSESSIONHELPER_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -56,5 +56,5 @@ namespace shell { namespace sessioninstall
     };
 }}
 
-#endif // SHELL_SESSIONINSTALL_SYNCDBUSSESSIONHELPER_HXX
+#endif // INCLUDED_SHELL_SOURCE_SESSIONINSTALL_SYNCDBUSSESSIONHELPER_HXX
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/tools/lngconvex/cmdline.hxx b/shell/source/tools/lngconvex/cmdline.hxx
index 2edb4bf5990f..2e907903c556 100644
--- a/shell/source/tools/lngconvex/cmdline.hxx
+++ b/shell/source/tools/lngconvex/cmdline.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CMDLINE_HXX_
-#define _CMDLINE_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_TOOLS_LNGCONVEX_CMDLINE_HXX
+#define INCLUDED_SHELL_SOURCE_TOOLS_LNGCONVEX_CMDLINE_HXX
 
 #include "defs.hxx"
 
diff --git a/shell/source/tools/lngconvex/defs.hxx b/shell/source/tools/lngconvex/defs.hxx
index 322c3b526967..1cf7054451e5 100644
--- a/shell/source/tools/lngconvex/defs.hxx
+++ b/shell/source/tools/lngconvex/defs.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DEFS_HXX_
-#define _DEFS_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_TOOLS_LNGCONVEX_DEFS_HXX
+#define INCLUDED_SHELL_SOURCE_TOOLS_LNGCONVEX_DEFS_HXX
 
 #include <vector>
 #include <string>
diff --git a/shell/source/unix/exec/shellexec.hxx b/shell/source/unix/exec/shellexec.hxx
index 741cdac8642d..37fe3e2cc481 100644
--- a/shell/source/unix/exec/shellexec.hxx
+++ b/shell/source/unix/exec/shellexec.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SHELLEXEC_HXX_
-#define _SHELLEXEC_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_UNIX_EXEC_SHELLEXEC_HXX
+#define INCLUDED_SHELL_SOURCE_UNIX_EXEC_SHELLEXEC_HXX
 
 #include <cppuhelper/implbase2.hxx>
 #include <osl/mutex.hxx>
diff --git a/shell/source/unix/sysshell/recently_used_file.hxx b/shell/source/unix/sysshell/recently_used_file.hxx
index f87b01df8724..32bdc05b84f8 100644
--- a/shell/source/unix/sysshell/recently_used_file.hxx
+++ b/shell/source/unix/sysshell/recently_used_file.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_RECENTLY_USED_FILE_HXX
-#define INCLUDED_RECENTLY_USED_FILE_HXX
+#ifndef INCLUDED_SHELL_SOURCE_UNIX_SYSSHELL_RECENTLY_USED_FILE_HXX
+#define INCLUDED_SHELL_SOURCE_UNIX_SYSSHELL_RECENTLY_USED_FILE_HXX
 
 #include <stdio.h>
 #include <unistd.h>
@@ -56,6 +56,6 @@ private:
     FILE* file_;
 };
 
-#endif // INCLUDED_RECENTLY_USED_FILE_HXX
+#endif // INCLUDED_SHELL_SOURCE_UNIX_SYSSHELL_RECENTLY_USED_FILE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/SysShExec.hxx b/shell/source/win32/SysShExec.hxx
index 39cd51e47f6f..aa01fe863c40 100644
--- a/shell/source/win32/SysShExec.hxx
+++ b/shell/source/win32/SysShExec.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SYSSHEXEC_HXX_
-#define _SYSSHEXEC_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_SYSSHEXEC_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_SYSSHEXEC_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <osl/mutex.hxx>
diff --git a/shell/source/win32/ooofilereader/autostyletag.hxx b/shell/source/win32/ooofilereader/autostyletag.hxx
index c426d5c790e3..3982b0c48758 100644
--- a/shell/source/win32/ooofilereader/autostyletag.hxx
+++ b/shell/source/win32/ooofilereader/autostyletag.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef AUTOSTYLETAG_HXX_INCLUDED
-#define AUTOSTYLETAG_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_AUTOSTYLETAG_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_AUTOSTYLETAG_HXX
 
 #include "itag.hxx"
 
diff --git a/shell/source/win32/ooofilereader/dummytag.hxx b/shell/source/win32/ooofilereader/dummytag.hxx
index 370697b48e45..a1be1198e62c 100644
--- a/shell/source/win32/ooofilereader/dummytag.hxx
+++ b/shell/source/win32/ooofilereader/dummytag.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef DUMMYTAG_HXX_INCLUDED
-#define DUMMYTAG_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_DUMMYTAG_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_DUMMYTAG_HXX
 
 #include "itag.hxx"
 
diff --git a/shell/source/win32/ooofilereader/itag.hxx b/shell/source/win32/ooofilereader/itag.hxx
index 6953fc60f453..eb8667d1e5c2 100644
--- a/shell/source/win32/ooofilereader/itag.hxx
+++ b/shell/source/win32/ooofilereader/itag.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef ITAG_HXX_INCLUDED
-#define ITAG_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_ITAG_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_ITAG_HXX
 
 #include "internal/config.hxx"
 #include "internal/types.hxx"
diff --git a/shell/source/win32/ooofilereader/keywordstag.hxx b/shell/source/win32/ooofilereader/keywordstag.hxx
index 43ba828dad30..6660b86f79cb 100644
--- a/shell/source/win32/ooofilereader/keywordstag.hxx
+++ b/shell/source/win32/ooofilereader/keywordstag.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef KEYWORDSTAG_HXX_INCLUDED
-#define KEYWORDSTAG_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_KEYWORDSTAG_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_KEYWORDSTAG_HXX
 
 #include "itag.hxx"
 
diff --git a/shell/source/win32/ooofilereader/simpletag.hxx b/shell/source/win32/ooofilereader/simpletag.hxx
index 01c3b7181ac6..0295b8ea4e98 100644
--- a/shell/source/win32/ooofilereader/simpletag.hxx
+++ b/shell/source/win32/ooofilereader/simpletag.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef SIMPLETAG_HXX_INCLUDED
-#define SIMPLETAG_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_SIMPLETAG_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_SIMPLETAG_HXX
 
 #include "itag.hxx"
 
diff --git a/shell/source/win32/shlxthandler/classfactory.hxx b/shell/source/win32/shlxthandler/classfactory.hxx
index f81b694da833..37b7146d2a5f 100644
--- a/shell/source/win32/shlxthandler/classfactory.hxx
+++ b/shell/source/win32/shlxthandler/classfactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CLASSFACTORY_HXX_INCLUDED
-#define CLASSFACTORY_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_CLASSFACTORY_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_CLASSFACTORY_HXX
 
 #if defined _MSC_VER
 #pragma warning(push, 1)
diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
index 1dde8ff9fdfa..5fa6ed52ab51 100644
--- a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
+++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOCUMENT_STATISTIC_HXX_INCLUDED
-#define DOCUMENT_STATISTIC_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_PROPSHEETS_DOCUMENT_STATISTIC_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_PROPSHEETS_DOCUMENT_STATISTIC_HXX
 
 #include <utility>
 #include <string>
diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx
index 0bfe65198cef..420a657413ed 100644
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef LISTVIEWBUILDER_HXX_INCLUDED
-#define LISTVIEWBUILDER_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_PROPSHEETS_LISTVIEWBUILDER_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_PROPSHEETS_LISTVIEWBUILDER_HXX
 
 #if defined _MSC_VER
 #pragma warning(push, 1)
diff --git a/shell/source/win32/simplemail/simplemapi.hxx b/shell/source/win32/simplemail/simplemapi.hxx
index 58f72fc6f40f..955aa5abc0d9 100644
--- a/shell/source/win32/simplemail/simplemapi.hxx
+++ b/shell/source/win32/simplemail/simplemapi.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SIMPLEMAPI_HXX
-#define INCLUDED_SIMPLEMAPI_HXX
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SIMPLEMAPI_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SIMPLEMAPI_HXX
 
 #define WIN32_LEAN_AND_MEAN
 #if defined _MSC_VER
diff --git a/shell/source/win32/simplemail/smplmailclient.hxx b/shell/source/win32/simplemail/smplmailclient.hxx
index c9020678b30d..ee9a16746c49 100644
--- a/shell/source/win32/simplemail/smplmailclient.hxx
+++ b/shell/source/win32/simplemail/smplmailclient.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SMPLMAILCLIENT_HXX_
-#define _SMPLMAILCLIENT_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILCLIENT_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILCLIENT_HXX
 
 #include <cppuhelper/compbase1.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/shell/source/win32/simplemail/smplmailmsg.hxx b/shell/source/win32/simplemail/smplmailmsg.hxx
index 7d659db363de..fb3929f7e0b1 100644
--- a/shell/source/win32/simplemail/smplmailmsg.hxx
+++ b/shell/source/win32/simplemail/smplmailmsg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SMPLMAILMSG_HXX_
-#define _SMPLMAILMSG_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILMSG_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILMSG_HXX
 
 #include <cppuhelper/compbase1.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/shell/source/win32/simplemail/smplmailsuppl.hxx b/shell/source/win32/simplemail/smplmailsuppl.hxx
index 7440cd870421..45a2d482a960 100644
--- a/shell/source/win32/simplemail/smplmailsuppl.hxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SMPLMAILSUPPL_HXX_
-#define _SMPLMAILSUPPL_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILSUPPL_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILSUPPL_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <osl/mutex.hxx>
diff --git a/shell/source/win32/zipfile/zipexcptn.hxx b/shell/source/win32/zipfile/zipexcptn.hxx
index 73996c7a8f32..52cfc51c18aa 100644
--- a/shell/source/win32/zipfile/zipexcptn.hxx
+++ b/shell/source/win32/zipfile/zipexcptn.hxx
@@ -19,8 +19,8 @@
 
 // ZipException.h: interface for the ZipException class.
 
-#ifndef ZIPEXCPTN_HXX_INCLUDED
-#define ZIPEXCPTN_HXX_INCLUDED
+#ifndef INCLUDED_SHELL_SOURCE_WIN32_ZIPFILE_ZIPEXCPTN_HXX
+#define INCLUDED_SHELL_SOURCE_WIN32_ZIPFILE_ZIPEXCPTN_HXX
 
 #include <stdexcept>