Resolves fdo#70681: fixincludeguards.pl: all that's left

Change-Id: I3e51a62710bb46c8255fd228d41d9300c90a1fb5
Reviewed-on: https://gerrit.libreoffice.org/9360
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

32 files changed, 84 insertions, 84 deletions

diff --git a/sal/android/uthash.h b/sal/android/uthash.h
index f31edaaa3c7b..48e7fba81026 100644
--- a/sal/android/uthash.h
+++ b/sal/android/uthash.h
@@ -22,8 +22,8 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef UTHASH_H
-#define UTHASH_H
+#ifndef INCLUDED_SAL_ANDROID_UTHASH_H
+#define INCLUDED_SAL_ANDROID_UTHASH_H
 
 #include <string.h>   /* memcmp,strlen */
 #include <stddef.h>   /* ptrdiff_t */
@@ -967,6 +967,6 @@ typedef struct UT_hash_handle {
    unsigned hashv;                   /* result of hash-fcn(key)        */
 } UT_hash_handle;
 
-#endif /* UTHASH_H */
+#endif // INCLUDED_SAL_ANDROID_UTHASH_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/internal/oslmemory.h b/sal/inc/internal/oslmemory.h
index 8ef094ad3cad..011a6e320606 100644
--- a/sal/inc/internal/oslmemory.h
+++ b/sal/inc/internal/oslmemory.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SAL_INTERNAL_OSLMEMORY_H
-#define INCLUDED_SAL_INTERNAL_OSLMEMORY_H
+#ifndef INCLUDED_SAL_INC_INTERNAL_OSLMEMORY_H
+#define INCLUDED_SAL_INC_INTERNAL_OSLMEMORY_H
 
 #include <sal/saldllapi.h>
 #include <sal/types.h>
diff --git a/sal/inc/internal/rtllifecycle.h b/sal/inc/internal/rtllifecycle.h
index a6d373ec26b7..29a493b8a802 100644
--- a/sal/inc/internal/rtllifecycle.h
+++ b/sal/inc/internal/rtllifecycle.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SAL_INTERNAL_RTLLIFECYCLE_H
-#define INCLUDED_SAL_INTERNAL_RTLLIFECYCLE_H
+#ifndef INCLUDED_SAL_INC_INTERNAL_RTLLIFECYCLE_H
+#define INCLUDED_SAL_INC_INTERNAL_RTLLIFECYCLE_H
 
 #if defined __cplusplus
 extern "C" {
diff --git a/sal/osl/unx/file_error_transl.h b/sal/osl/unx/file_error_transl.h
index 7033e38d744a..2548dea042a2 100644
--- a/sal/osl/unx/file_error_transl.h
+++ b/sal/osl/unx/file_error_transl.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FILE_ERROR_TRANSL_H_
-#define _FILE_ERROR_TRANSL_H_
+#ifndef INCLUDED_SAL_OSL_UNX_FILE_ERROR_TRANSL_H
+#define INCLUDED_SAL_OSL_UNX_FILE_ERROR_TRANSL_H
 
 #include <osl/file.h>
 #include <sal/types.h>
diff --git a/sal/osl/unx/file_impl.hxx b/sal/osl/unx/file_impl.hxx
index d1031bc07298..e1ed0affc8f2 100644
--- a/sal/osl/unx/file_impl.hxx
+++ b/sal/osl/unx/file_impl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_FILE_IMPL_HXX
-#define INCLUDED_FILE_IMPL_HXX
+#ifndef INCLUDED_SAL_OSL_UNX_FILE_IMPL_HXX
+#define INCLUDED_SAL_OSL_UNX_FILE_IMPL_HXX
 
 #include "osl/file.h"
 #include <stddef.h>
@@ -53,6 +53,6 @@ oslFileError openFilePath(
     oslFileHandle* pHandle,
     sal_uInt32 uFlags, mode_t mode );
 
-#endif /* INCLUDED_FILE_IMPL_HXX */
+#endif // INCLUDED_SAL_OSL_UNX_FILE_IMPL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_path_helper.h b/sal/osl/unx/file_path_helper.h
index bf084ba4e18c..799f497ce475 100644
--- a/sal/osl/unx/file_path_helper.h
+++ b/sal/osl/unx/file_path_helper.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_FILE_PATH_HELPER_H_
-#define _OSL_FILE_PATH_HELPER_H_
+#ifndef INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_H
+#define INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_H
 
 #include <sal/types.h>
 #include <rtl/ustring.h>
diff --git a/sal/osl/unx/file_path_helper.hxx b/sal/osl/unx/file_path_helper.hxx
index a2b4607ba5ab..6b1418daec9a 100644
--- a/sal/osl/unx/file_path_helper.hxx
+++ b/sal/osl/unx/file_path_helper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_FILE_PATH_HELPER_HXX_
-#define _OSL_FILE_PATH_HELPER_HXX_
+#ifndef INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_HXX
+#define INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_HXX
 
 #include "file_path_helper.h"
 
diff --git a/sal/osl/unx/file_url.h b/sal/osl/unx/file_url.h
index 4f418b264705..10168636da52 100644
--- a/sal/osl/unx/file_url.h
+++ b/sal/osl/unx/file_url.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_FILE_URL_H
-#define INCLUDED_FILE_URL_H
+#ifndef INCLUDED_SAL_OSL_UNX_FILE_URL_H
+#define INCLUDED_SAL_OSL_UNX_FILE_URL_H
 
 #include "osl/file.h"
 
@@ -39,6 +39,6 @@ int TextToUnicode(const char* text, size_t text_buffer_size, sal_Unicode* unic_t
 }
 #endif
 
-#endif /* #define INCLUDED_FILE_URL_H */
+#endif /* #define INCLUDED_SAL_OSL_UNX_FILE_URL_H */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index 057257e691f6..3a0babd4e53c 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __OSL_SYSTEM_H__
-#define __OSL_SYSTEM_H__
+#ifndef INCLUDED_SAL_OSL_UNX_SYSTEM_H
+#define INCLUDED_SAL_OSL_UNX_SYSTEM_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -411,6 +411,6 @@ struct hostent *gethostbyname_r(const char *name, struct hostent *result,
 #endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
 #endif
 
-#endif /* __OSL_SYSTEM_H__ */
+#endif // INCLUDED_SAL_OSL_UNX_SYSTEM_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/uunxapi.h b/sal/osl/unx/uunxapi.h
index 3b431ad292e2..76b5e4146dfd 100644
--- a/sal/osl/unx/uunxapi.h
+++ b/sal/osl/unx/uunxapi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_UUNXAPI_H_
-#define _OSL_UUNXAPI_H_
+#ifndef INCLUDED_SAL_OSL_UNX_UUNXAPI_H
+#define INCLUDED_SAL_OSL_UNX_UUNXAPI_H
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -65,6 +65,6 @@ int ftruncate_with_name(int fd, sal_uInt64 uSize, rtl_String* path);
 }
 #endif
 
-#endif /* _OSL_UUNXAPI_H_ */
+#endif // INCLUDED_SAL_OSL_UNX_UUNXAPI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/uunxapi.hxx b/sal/osl/unx/uunxapi.hxx
index 1a2fc4722feb..fbacb83ef69c 100644
--- a/sal/osl/unx/uunxapi.hxx
+++ b/sal/osl/unx/uunxapi.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_UUNXAPI_HXX_
-#define _OSL_UUNXAPI_HXX_
+#ifndef INCLUDED_SAL_OSL_UNX_UUNXAPI_HXX
+#define INCLUDED_SAL_OSL_UNX_UUNXAPI_HXX
 
 #include "uunxapi.h"
 
@@ -62,6 +62,6 @@ namespace osl
     }
 } // end namespace osl
 
-#endif /* _OSL_UUNXAPI_HXX_ */
+#endif // INCLUDED_SAL_OSL_UNX_UUNXAPI_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/file_error.h b/sal/osl/w32/file_error.h
index d31f1f842b79..483b966ff9c9 100644
--- a/sal/osl/w32/file_error.h
+++ b/sal/osl/w32/file_error.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_OSL_FILE_ERROR_H
-#define INCLUDED_OSL_FILE_ERROR_H
+#ifndef INCLUDED_SAL_OSL_W32_FILE_ERROR_H
+#define INCLUDED_SAL_OSL_W32_FILE_ERROR_H
 
 #include "osl/file.h"
 
@@ -32,6 +32,6 @@ oslFileError oslTranslateFileError (/*DWORD*/ unsigned long dwError);
 }
 #endif
 
-#endif /* INCLUDED_OSL_FILE_ERROR_H */
+#endif // INCLUDED_SAL_OSL_W32_FILE_ERROR_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/file_url.h b/sal/osl/w32/file_url.h
index 0115d99cf0d5..080b3ca7f93c 100644
--- a/sal/osl/w32/file_url.h
+++ b/sal/osl/w32/file_url.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_OSL_FILE_URL_H
-#define INCLUDED_OSL_FILE_URL_H
+#ifndef INCLUDED_SAL_OSL_W32_FILE_URL_H
+#define INCLUDED_SAL_OSL_W32_FILE_URL_H
 
 #include "sal/types.h"
 #include "rtl/ustring.h"
@@ -86,6 +86,6 @@ oslFileError _osl_getFileURLFromSystemPath (
 }
 #endif
 
-#endif /* INCLUDED_OSL_FILE_URL_H */
+#endif // INCLUDED_SAL_OSL_W32_FILE_URL_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/path_helper.h b/sal/osl/w32/path_helper.h
index b1ceb4fc62d1..056a1ca299e8 100644
--- a/sal/osl/w32/path_helper.h
+++ b/sal/osl/w32/path_helper.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PATH_HELPER_H_
-#define _PATH_HELPER_H_
+#ifndef INCLUDED_SAL_OSL_W32_PATH_HELPER_H
+#define INCLUDED_SAL_OSL_W32_PATH_HELPER_H
 
 #include <sal/types.h>
 #include <rtl/ustring.h>
diff --git a/sal/osl/w32/path_helper.hxx b/sal/osl/w32/path_helper.hxx
index fc44e25df170..6092098a560e 100644
--- a/sal/osl/w32/path_helper.hxx
+++ b/sal/osl/w32/path_helper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PATH_HELPER_HXX_
-#define _PATH_HELPER_HXX_
+#ifndef INCLUDED_SAL_OSL_W32_PATH_HELPER_HXX
+#define INCLUDED_SAL_OSL_W32_PATH_HELPER_HXX
 
 #include "path_helper.h"
 #include <rtl/ustring.hxx>
diff --git a/sal/qa/OStringBuffer/rtl_String_Const.h b/sal/qa/OStringBuffer/rtl_String_Const.h
index 7cc383701954..b6b25113e797 100644
--- a/sal/qa/OStringBuffer/rtl_String_Const.h
+++ b/sal/qa/OStringBuffer/rtl_String_Const.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_STRING_CONST_H_
-#define _RTL_STRING_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSTRINGBUFFER_RTL_STRING_CONST_H
+#define INCLUDED_SAL_QA_OSTRINGBUFFER_RTL_STRING_CONST_H
 
 #include <limits.h>
 #include <sal/types.h>
@@ -463,6 +463,6 @@ static const sal_Int32 kNonSInt16Max = SHRT_MIN;
 }
 #endif
 
-#endif /* _RTL_STRING_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSTRINGBUFFER_RTL_STRING_CONST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
index 301c8a9f9b3c..fc258ead340f 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
+++ b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_STRING_UTILS_CONST_H_
-#define _RTL_STRING_UTILS_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSTRINGBUFFER_RTL_STRING_UTILS_CONST_H
+#define INCLUDED_SAL_QA_OSTRINGBUFFER_RTL_STRING_UTILS_CONST_H
 
 #include <sal/types.h>
 
@@ -40,6 +40,6 @@ static const sal_Int32 kErrCompareNAStringToString     = -9;
 }
 #endif
 
-#endif /* _RTL_STRING_UTILS_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSTRINGBUFFER_RTL_STRING_UTILS_CONST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/inc/stringhelper.hxx b/sal/qa/inc/stringhelper.hxx
index 84eae3798bf1..cb7a0ab70c06 100644
--- a/sal/qa/inc/stringhelper.hxx
+++ b/sal/qa/inc/stringhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef STRINGHELPER_HXX
-#define STRINGHELPER_HXX
+#ifndef INCLUDED_SAL_QA_INC_STRINGHELPER_HXX
+#define INCLUDED_SAL_QA_INC_STRINGHELPER_HXX
 
 #include <rtl/ustring.hxx>
 #include <rtl/string.hxx>
diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h
index 88df6384f362..614d906023cc 100644
--- a/sal/qa/osl/condition/osl_Condition_Const.h
+++ b/sal/qa/osl/condition/osl_Condition_Const.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_CONDITION_CONST_H_
-#define _OSL_CONDITION_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSL_CONDITION_OSL_CONDITION_CONST_H
+#define INCLUDED_SAL_QA_OSL_CONDITION_OSL_CONDITION_CONST_H
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
@@ -45,6 +45,6 @@ OSLTEST_DECLARE_USTRING( TestCon,  "testcondition" );
 
 const char pTestString[17] = "Sun Microsystems";
 
-#endif /* _OSL_CONDITION_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSL_CONDITION_OSL_CONDITION_CONST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h
index 6a27c86246b8..97db12bdd446 100644
--- a/sal/qa/osl/file/osl_File_Const.h
+++ b/sal/qa/osl/file/osl_File_Const.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_FILE_CONST_H_
-#define _OSL_FILE_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSL_FILE_OSL_FILE_CONST_H
+#define INCLUDED_SAL_QA_OSL_FILE_OSL_FILE_CONST_H
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -197,6 +197,6 @@ OSLTEST_DECLARE( VolURL6,  FILE_PREFIX  "e:/" );
 }
 #endif
 
-#endif /* _OSL_FILE_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSL_FILE_OSL_FILE_CONST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h
index f5417023b2a7..40b33218d047 100644
--- a/sal/qa/osl/module/osl_Module_Const.h
+++ b/sal/qa/osl/module/osl_Module_Const.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_MODULE_CONST_H_
-#define _OSL_MODULE_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSL_MODULE_OSL_MODULE_CONST_H
+#define INCLUDED_SAL_QA_OSL_MODULE_OSL_MODULE_CONST_H
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
@@ -42,6 +42,6 @@
 
 typedef sal_Bool (* FuncPtr )( sal_Bool );
 
-#endif /* _OSL_MODULE_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSL_MODULE_OSL_MODULE_CONST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/mutex/osl_Mutex_Const.h b/sal/qa/osl/mutex/osl_Mutex_Const.h
index fb6bfaa5f1eb..a5ac53ed4564 100644
--- a/sal/qa/osl/mutex/osl_Mutex_Const.h
+++ b/sal/qa/osl/mutex/osl_Mutex_Const.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_MUTEX_CONST_H_
-#define _OSL_MUTEX_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSL_MUTEX_OSL_MUTEX_CONST_H
+#define INCLUDED_SAL_QA_OSL_MUTEX_OSL_MUTEX_CONST_H
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
@@ -32,6 +32,6 @@
 
 #define BUFFER_SIZE 16
 
-#endif /* _OSL_MUTEX_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSL_MUTEX_OSL_MUTEX_CONST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h
index 17e8c1a33df7..1dfa2422e7cb 100644
--- a/sal/qa/osl/security/osl_Security_Const.h
+++ b/sal/qa/osl/security/osl_Security_Const.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_SECURITY_CONST_H_
-#define _OSL_SECURITY_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSL_SECURITY_OSL_SECURITY_CONST_H
+#define INCLUDED_SAL_QA_OSL_SECURITY_OSL_SECURITY_CONST_H
 
 #if ( defined WNT )                     // Windows
 #include <io.h>
@@ -53,6 +53,6 @@ const char pTestString[17] = "Sun Microsystems";
 
 bool isAdmin = sal_False;
 
-#endif /* _OSL_SECURITY_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSL_SECURITY_OSL_SECURITY_CONST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/socket/sockethelper.hxx b/sal/qa/osl/socket/sockethelper.hxx
index 1c43eaaf8a0f..4debc78d87f4 100644
--- a/sal/qa/osl/socket/sockethelper.hxx
+++ b/sal/qa/osl/socket/sockethelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SOCKETHELPER_HXX_
-#define _SOCKETHELPER_HXX_
+#ifndef INCLUDED_SAL_QA_OSL_SOCKET_SOCKETHELPER_HXX
+#define INCLUDED_SAL_QA_OSL_SOCKET_SOCKETHELPER_HXX
 
 #include <sal/types.h>
 #include <rtl/textenc.h>
diff --git a/sal/qa/rtl/process/rtl_Process_Const.h b/sal/qa/rtl/process/rtl_Process_Const.h
index 8abffb2d7a96..132cd567519b 100644
--- a/sal/qa/rtl/process/rtl_Process_Const.h
+++ b/sal/qa/rtl/process/rtl_Process_Const.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_PROCESS_CONST_H_
-#define _RTL_PROCESS_CONST_H_
+#ifndef INCLUDED_SAL_QA_RTL_PROCESS_RTL_PROCESS_CONST_H
+#define INCLUDED_SAL_QA_RTL_PROCESS_RTL_PROCESS_CONST_H
 
 #include <rtl/ustring.hxx>
 
diff --git a/sal/rtl/alloc_arena.hxx b/sal/rtl/alloc_arena.hxx
index 69aa1897866e..da2ebeacc683 100644
--- a/sal/rtl/alloc_arena.hxx
+++ b/sal/rtl/alloc_arena.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_RTL_ALLOC_ARENA_HXX
-#define INCLUDED_RTL_ALLOC_ARENA_HXX
+#ifndef INCLUDED_SAL_RTL_ALLOC_ARENA_HXX
+#define INCLUDED_SAL_RTL_ALLOC_ARENA_HXX
 
 #include "sal/types.h"
 #include "rtl/alloc.h"
@@ -112,6 +112,6 @@ struct rtl_arena_st
  */
 extern rtl_arena_type * gp_default_arena;
 
-#endif /* INCLUDED_RTL_ALLOC_ARENA_HXX */
+#endif // INCLUDED_SAL_RTL_ALLOC_ARENA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/alloc_cache.hxx b/sal/rtl/alloc_cache.hxx
index 01db4b2dd1cb..1afcd4288922 100644
--- a/sal/rtl/alloc_cache.hxx
+++ b/sal/rtl/alloc_cache.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_RTL_ALLOC_CACHE_HXX
-#define INCLUDED_RTL_ALLOC_CACHE_HXX
+#ifndef INCLUDED_SAL_RTL_ALLOC_CACHE_HXX
+#define INCLUDED_SAL_RTL_ALLOC_CACHE_HXX
 
 #include "sal/types.h"
 #include "rtl/alloc.h"
@@ -152,6 +152,6 @@ struct rtl_cache_st
     rtl_cache_stat_type       m_cpu_stats;
 };
 
-#endif /* INCLUDED_RTL_ALLOC_CACHE_HXX */
+#endif // INCLUDED_SAL_RTL_ALLOC_CACHE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/alloc_impl.hxx b/sal/rtl/alloc_impl.hxx
index b4d7cf495a59..57ababe7de79 100644
--- a/sal/rtl/alloc_impl.hxx
+++ b/sal/rtl/alloc_impl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_RTL_ALLOC_IMPL_HXX
-#define INCLUDED_RTL_ALLOC_IMPL_HXX
+#ifndef INCLUDED_SAL_RTL_ALLOC_IMPL_HXX
+#define INCLUDED_SAL_RTL_ALLOC_IMPL_HXX
 
 #include "sal/types.h"
 
@@ -202,6 +202,6 @@ typedef enum { AMode_CUSTOM, AMode_SYSTEM, AMode_UNSET } AllocMode;
 
 extern AllocMode alloc_mode;
 
-#endif /* INCLUDED_RTL_ALLOC_IMPL_HXX */
+#endif // INCLUDED_SAL_RTL_ALLOC_IMPL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/hash.hxx b/sal/rtl/hash.hxx
index f9338fb4660c..5997118ca291 100644
--- a/sal/rtl/hash.hxx
+++ b/sal/rtl/hash.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_RTL_SOURCE_HASH_HXX
-#define INCLUDED_RTL_SOURCE_HASH_HXX
+#ifndef INCLUDED_SAL_RTL_HASH_HXX
+#define INCLUDED_SAL_RTL_HASH_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.h>
@@ -29,6 +29,6 @@ rtl_uString     *rtl_str_hash_intern (rtl_uString       *pString,
                                       int                can_return);
 void             rtl_str_hash_remove (rtl_uString       *pString);
 
-#endif /* INCLUDED_RTL_SOURCE_HASH_HXX */
+#endif // INCLUDED_SAL_RTL_HASH_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/strimp.hxx b/sal/rtl/strimp.hxx
index e31717c39539..d7370773f477 100644
--- a/sal/rtl/strimp.hxx
+++ b/sal/rtl/strimp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_RTL_SOURCE_STRIMP_HXX
-#define INCLUDED_RTL_SOURCE_STRIMP_HXX
+#ifndef INCLUDED_SAL_RTL_STRIMP_HXX
+#define INCLUDED_SAL_RTL_STRIMP_HXX
 
 #include <config_probes.h>
 #if USE_SDT_PROBES
@@ -77,6 +77,6 @@ bool rtl_ImplIsWhitespace( sal_Unicode c );
 #  define RTL_LOG_STRING_INTERN_DELETE(s)
 #endif /* USE_SDT_PROBES */
 
-#endif /* INCLUDED_RTL_SOURCE_STRIMP_HXX */
+#endif // INCLUDED_SAL_RTL_STRIMP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/surrogates.hxx b/sal/rtl/surrogates.hxx
index e06567d687de..ac47050dc594 100644
--- a/sal/rtl/surrogates.hxx
+++ b/sal/rtl/surrogates.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SAL_RTL_SOURCE_SURROGATES_HXX
-#define INCLUDED_SAL_RTL_SOURCE_SURROGATES_HXX
+#ifndef INCLUDED_SAL_RTL_SURROGATES_HXX
+#define INCLUDED_SAL_RTL_SURROGATES_HXX
 
 #include "sal/config.h"
 
diff --git a/sal/workben/clipboardwben/testcopy/XTDataObject.hxx b/sal/workben/clipboardwben/testcopy/XTDataObject.hxx
index b899344142f1..de36a62d7d4f 100644
--- a/sal/workben/clipboardwben/testcopy/XTDataObject.hxx
+++ b/sal/workben/clipboardwben/testcopy/XTDataObject.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XTDATAOBJECT_HXX_
-#define _XTDATAOBJECT_HXX_
+#ifndef INCLUDED_SAL_WORKBEN_CLIPBOARDWBEN_TESTCOPY_XTDATAOBJECT_HXX
+#define INCLUDED_SAL_WORKBEN_CLIPBOARDWBEN_TESTCOPY_XTDATAOBJECT_HXX
 
 /*
 #include <com/sun/star/datatransfer/XTransferable.hpp>