fixincludeguards.sh: include/o*

Change-Id: Ibd5d8af00f6582d53231c76e2b04e737b5804497

29 files changed, 80 insertions, 80 deletions

diff --git a/include/osl/conditn.h b/include/osl/conditn.h
index 8803ee85f2dd..a5d3d6054d01 100644
--- a/include/osl/conditn.h
+++ b/include/osl/conditn.h
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _OSL_CONDITION_H_
-#define _OSL_CONDITION_H_
+#ifndef INCLUDED_OSL_CONDITN_H
+#define INCLUDED_OSL_CONDITN_H
 
 #include "sal/config.h"
 
@@ -83,6 +83,6 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_checkCondition(oslCondition Condition);
 }
 #endif
 
-#endif /* _OSL_CONDITION_H_ */
+#endif // INCLUDED_OSL_CONDITN_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/conditn.hxx b/include/osl/conditn.hxx
index 449242273a7f..5ca0323c2aa8 100644
--- a/include/osl/conditn.hxx
+++ b/include/osl/conditn.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_CONDITN_HXX_
-#define _OSL_CONDITN_HXX_
+#ifndef INCLUDED_OSL_CONDITN_HXX
+#define INCLUDED_OSL_CONDITN_HXX
 
 #ifdef __cplusplus
 
@@ -116,6 +116,6 @@ namespace osl
 }
 
 #endif  /* __cplusplus */
-#endif  /* _OSL_CONDITN_HXX_ */
+#endif // INCLUDED_OSL_CONDITN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/detail/android-bootstrap.h b/include/osl/detail/android-bootstrap.h
index 71b407272fcf..002027a5d8a0 100644
--- a/include/osl/detail/android-bootstrap.h
+++ b/include/osl/detail/android-bootstrap.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef ANDROID_BOOSTRAP_H
-#define ANDROID_BOOSTRAP_H
+#ifndef INCLUDED_OSL_DETAIL_ANDROID_BOOTSTRAP_H
+#define INCLUDED_OSL_DETAIL_ANDROID_BOOTSTRAP_H
 
 #if defined(ANDROID)
 
diff --git a/include/osl/detail/component-mapping.h b/include/osl/detail/component-mapping.h
index 4a0f4796a7b3..61354f59eed8 100644
--- a/include/osl/detail/component-mapping.h
+++ b/include/osl/detail/component-mapping.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef COMPONENT_MAPPING_H
-#define COMPONENT_MAPPING_H
+#ifndef INCLUDED_OSL_DETAIL_COMPONENT_MAPPING_H
+#define INCLUDED_OSL_DETAIL_COMPONENT_MAPPING_H
 
 #ifdef DISABLE_DYNLOADING
 
@@ -37,6 +37,6 @@ const lib_to_component_mapping *lo_get_libmap(void);
 
 #endif /* DISABLE_DYNLOADING */
 
-#endif /* COMPONENT_MAPPING_H */
+#endif // INCLUDED_OSL_DETAIL_COMPONENT_MAPPING_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/diagnose.h b/include/osl/diagnose.h
index b3bfee91ad25..883e63a04d6f 100644
--- a/include/osl/diagnose.h
+++ b/include/osl/diagnose.h
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _OSL_DIAGNOSE_H_
-#define _OSL_DIAGNOSE_H_
+#ifndef INCLUDED_OSL_DIAGNOSE_H
+#define INCLUDED_OSL_DIAGNOSE_H
 
 #include "sal/config.h"
 
@@ -199,6 +199,6 @@ SAL_DLLPUBLIC pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugM
 #define OSL_THIS_FUNC ""
 #endif
 
-#endif /* _OSL_DIAGNOSE_H_ */
+#endif // INCLUDED_OSL_DIAGNOSE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/diagnose.hxx b/include/osl/diagnose.hxx
index c7a6aa827f38..3d697d46e7c0 100644
--- a/include/osl/diagnose.hxx
+++ b/include/osl/diagnose.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 OSL_DIAGNOSE_HXX_INCLUDED
-#define OSL_DIAGNOSE_HXX_INCLUDED
+#ifndef INCLUDED_OSL_DIAGNOSE_HXX
+#define INCLUDED_OSL_DIAGNOSE_HXX
 
 #include "sal/config.h"
 
@@ -206,6 +206,6 @@ private:
 
 /// @endcond
 
-#endif // ! defined(OSL_DIAGNOSE_HXX_INCLUDED)
+#endif // ! defined( INCLUDED_OSL_DIAGNOSE_HXX)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/endian.h b/include/osl/endian.h
index 82ec1eaca7b1..13389830e5ff 100644
--- a/include/osl/endian.h
+++ b/include/osl/endian.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_ENDIAN_H_
-#define _OSL_ENDIAN_H_
+#ifndef INCLUDED_OSL_ENDIAN_H
+#define INCLUDED_OSL_ENDIAN_H
 
 #include <sal/types.h>
 
@@ -221,6 +221,6 @@ extern "C" {
 }
 #endif
 
-#endif /*_OSL_ENDIAN_H_ */
+#endif // INCLUDED_OSL_ENDIAN_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/file.h b/include/osl/file.h
index 44013bf2ead1..facbb26c5d14 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_FILE_H_
-#define _OSL_FILE_H_
+#ifndef INCLUDED_OSL_FILE_H
+#define INCLUDED_OSL_FILE_H
 
 #include "sal/config.h"
 
@@ -1633,7 +1633,7 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_createTempFile(
 }
 #endif
 
-#endif  /* _OSL_FILE_H_ */
+#endif // INCLUDED_OSL_FILE_H
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index c62ef8dbe29f..bdb5bda44e3c 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_FILE_HXX_
-#define _OSL_FILE_HXX_
+#ifndef INCLUDED_OSL_FILE_HXX
+#define INCLUDED_OSL_FILE_HXX
 
 #include "sal/config.h"
 
@@ -1974,6 +1974,6 @@ public:
 
 } /* namespace osl */
 
-#endif  /* _OSL_FILE_HXX_ */
+#endif // INCLUDED_OSL_FILE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/interlck.h b/include/osl/interlck.h
index 31212deed274..416704299ae2 100644
--- a/include/osl/interlck.h
+++ b/include/osl/interlck.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_INTERLOCK_H_
-#define _OSL_INTERLOCK_H_
+#ifndef INCLUDED_OSL_INTERLCK_H
+#define INCLUDED_OSL_INTERLCK_H
 
 #include "sal/config.h"
 
@@ -86,7 +86,7 @@ SAL_DLLPUBLIC oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInte
 #endif
 
 
-#endif  /* _OSL_INTERLOCK_H_ */
+#endif // INCLUDED_OSL_INTERLCK_H
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/module.h b/include/osl/module.h
index 09f2b17b401c..982e846b8724 100644
--- a/include/osl/module.h
+++ b/include/osl/module.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_MODULE_H_
-#define _OSL_MODULE_H_
+#ifndef INCLUDED_OSL_MODULE_H
+#define INCLUDED_OSL_MODULE_H
 
 #include "sal/config.h"
 
@@ -246,6 +246,6 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getModuleURLFromFunctionAddress(
 }
 #endif
 
-#endif  /* _OSL_MODULE_H_  */
+#endif // INCLUDED_OSL_MODULE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/module.hxx b/include/osl/module.hxx
index 317579dc816b..98cd1e32c33d 100644
--- a/include/osl/module.hxx
+++ b/include/osl/module.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_MODULE_HXX_
-#define _OSL_MODULE_HXX_
+#ifndef INCLUDED_OSL_MODULE_HXX
+#define INCLUDED_OSL_MODULE_HXX
 
 #include <rtl/ustring.hxx>
 #include <osl/module.h>
diff --git a/include/osl/mutex.h b/include/osl/mutex.h
index 1336d4fcea95..98d897ae8b32 100644
--- a/include/osl/mutex.h
+++ b/include/osl/mutex.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_MUTEX_H_
-#define _OSL_MUTEX_H_
+#ifndef INCLUDED_OSL_MUTEX_H
+#define INCLUDED_OSL_MUTEX_H
 
 #include "sal/config.h"
 
@@ -69,6 +69,6 @@ SAL_DLLPUBLIC oslMutex * SAL_CALL osl_getGlobalMutex(void);
 }
 #endif
 
-#endif  /* _OSL_MUTEX_H_ */
+#endif // INCLUDED_OSL_MUTEX_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/mutex.hxx b/include/osl/mutex.hxx
index 9fab63fb27c3..55eb7414b038 100644
--- a/include/osl/mutex.hxx
+++ b/include/osl/mutex.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_MUTEX_HXX_
-#define _OSL_MUTEX_HXX_
+#ifndef INCLUDED_OSL_MUTEX_HXX
+#define INCLUDED_OSL_MUTEX_HXX
 
 #ifdef __cplusplus
 
@@ -241,6 +241,6 @@ namespace osl
 }
 
 #endif  /* __cplusplus */
-#endif  /* _OSL_MUTEX_HXX_ */
+#endif // INCLUDED_OSL_MUTEX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/nlsupport.h b/include/osl/nlsupport.h
index 9af93d9237ec..9173151f4054 100644
--- a/include/osl/nlsupport.h
+++ b/include/osl/nlsupport.h
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _OSL_NLSUPPORT_H_
-#define _OSL_NLSUPPORT_H_
+#ifndef INCLUDED_OSL_NLSUPPORT_H
+#define INCLUDED_OSL_NLSUPPORT_H
 
 #include "sal/config.h"
 
@@ -51,7 +51,7 @@ SAL_DLLPUBLIC rtl_TextEncoding SAL_CALL osl_getTextEncodingFromLocale(
 }
 #endif
 
-#endif  /* _OSL_NLSUPPORT_H_ */
+#endif // INCLUDED_OSL_NLSUPPORT_H
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/pipe.h b/include/osl/pipe.h
index 52ba8b9813e6..f5b1561c7341 100644
--- a/include/osl/pipe.h
+++ b/include/osl/pipe.h
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _OSL_PIPE_H_
-#define _OSL_PIPE_H_
+#ifndef INCLUDED_OSL_PIPE_H
+#define INCLUDED_OSL_PIPE_H
 
 #include "sal/config.h"
 
@@ -92,6 +92,6 @@ SAL_DLLPUBLIC oslPipeError SAL_CALL osl_getLastPipeError(oslPipe Pipe);
 }
 #endif
 
-#endif  /* _OSL_PIPE_H_ */
+#endif // INCLUDED_OSL_PIPE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/pipe.hxx b/include/osl/pipe.hxx
index 906ca8b08fb8..e1bb0d32b926 100644
--- a/include/osl/pipe.hxx
+++ b/include/osl/pipe.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 _OSL_PIPE_HXX_
-#define _OSL_PIPE_HXX_
+#ifndef INCLUDED_OSL_PIPE_HXX
+#define INCLUDED_OSL_PIPE_HXX
 
 #include <osl/pipe_decl.hxx>
 
diff --git a/include/osl/pipe_decl.hxx b/include/osl/pipe_decl.hxx
index 21e07952b7ff..0fb8c4429cd4 100644
--- a/include/osl/pipe_decl.hxx
+++ b/include/osl/pipe_decl.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 _OSL_PIPE_DECL_HXX_
-#define _OSL_PIPE_DECL_HXX_
+#ifndef INCLUDED_OSL_PIPE_DECL_HXX
+#define INCLUDED_OSL_PIPE_DECL_HXX
 
 #include <osl/pipe.h>
 #   include <osl/security.hxx>
diff --git a/include/osl/process.h b/include/osl/process.h
index d575f3cf867c..300c5754655e 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _OSL_PROCESS_H_
-#define _OSL_PROCESS_H_
+#ifndef INCLUDED_OSL_PROCESS_H
+#define INCLUDED_OSL_PROCESS_H
 
 #include "sal/config.h"
 
@@ -446,6 +446,6 @@ SAL_DLLPUBLIC oslSocket SAL_CALL osl_receiveResourcePipe(
 }
 #endif
 
-#endif    /* _OSL_PROCESS_H_ */
+#endif // INCLUDED_OSL_PROCESS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/profile.h b/include/osl/profile.h
index fcbf898c5754..40ccc7dfeae1 100644
--- a/include/osl/profile.h
+++ b/include/osl/profile.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_PROFILE_H_
-#define _OSL_PROFILE_H_
+#ifndef INCLUDED_OSL_PROFILE_H
+#define INCLUDED_OSL_PROFILE_H
 
 #include "sal/config.h"
 
@@ -140,6 +140,6 @@ SAL_DLLPUBLIC sal_uInt32 SAL_CALL osl_getProfileSections(
 }
 #endif
 
-#endif  /* _OSL_PROFILE_H_ */
+#endif // INCLUDED_OSL_PROFILE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/profile.hxx b/include/osl/profile.hxx
index 9197067555cf..3d7452174f00 100644
--- a/include/osl/profile.hxx
+++ b/include/osl/profile.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_PROFILE_HXX_
-#define _OSL_PROFILE_HXX_
+#ifndef INCLUDED_OSL_PROFILE_HXX
+#define INCLUDED_OSL_PROFILE_HXX
 
 #include "profile.h"
 #include <rtl/ustring.hxx>
@@ -190,7 +190,7 @@ namespace osl {
     };
 }
 
-#endif  /* _OSL_PROFILE_HXX_ */
+#endif // INCLUDED_OSL_PROFILE_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/security.h b/include/osl/security.h
index b1376a2ed2a1..4fa780b5fedc 100644
--- a/include/osl/security.h
+++ b/include/osl/security.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_SECURITY_H_
-#define _OSL_SECURITY_H_
+#ifndef INCLUDED_OSL_SECURITY_H
+#define INCLUDED_OSL_SECURITY_H
 
 #include "sal/config.h"
 
@@ -158,6 +158,6 @@ SAL_DLLPUBLIC void SAL_CALL osl_unloadUserProfile(
 }
 #endif
 
-#endif  /* _OSL_SECURITY_H_ */
+#endif // INCLUDED_OSL_SECURITY_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/security_decl.hxx b/include/osl/security_decl.hxx
index ba2f4195d769..5ea3cb17fdaf 100644
--- a/include/osl/security_decl.hxx
+++ b/include/osl/security_decl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_SECURITY_DECL_HXX_
-#define _OSL_SECURITY_DECL_HXX_
+#ifndef INCLUDED_OSL_SECURITY_DECL_HXX
+#define INCLUDED_OSL_SECURITY_DECL_HXX
 
 #include <rtl/ustring.hxx>
 #   include <osl/security.h>
@@ -105,6 +105,6 @@ public:
 
 }
 
-#endif  // _OSL_SECURITY_HXX_
+#endif // INCLUDED_OSL_SECURITY_DECL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/signal.h b/include/osl/signal.h
index ca113308cf92..75af0329a622 100644
--- a/include/osl/signal.h
+++ b/include/osl/signal.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_SIGNAL_H_
-#define _OSL_SIGNAL_H_
+#ifndef INCLUDED_OSL_SIGNAL_H
+#define INCLUDED_OSL_SIGNAL_H
 
 #include "sal/config.h"
 
@@ -106,7 +106,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_setErrorReporting(
 }
 #endif
 
-#endif  /* _OSL_SIGNAL_H_ */
+#endif // INCLUDED_OSL_SIGNAL_H
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/socket.h b/include/osl/socket.h
index 8ccb2c740f53..23161c303bd3 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_SOCKET_H_
-#define _OSL_SOCKET_H_
+#ifndef INCLUDED_OSL_SOCKET_H
+#define INCLUDED_OSL_SOCKET_H
 
 #include <rtl/ustring.h>
 #include <rtl/byteseq.h>
@@ -915,6 +915,6 @@ SAL_DLLPUBLIC sal_Int32 SAL_CALL osl_writeSocket( oslSocket Socket, const void *
 }
 #endif
 
-#endif  /* _OSL_SOCKET_H_ */
+#endif // INCLUDED_OSL_SOCKET_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/socket.hxx b/include/osl/socket.hxx
index f8246c48a448..2537d9f970a6 100644
--- a/include/osl/socket.hxx
+++ b/include/osl/socket.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 _OSL_SOCKET_HXX_
-#define _OSL_SOCKET_HXX_
+#ifndef INCLUDED_OSL_SOCKET_HXX
+#define INCLUDED_OSL_SOCKET_HXX
 
 #include <osl/socket_decl.hxx>
 
diff --git a/include/osl/socket_decl.hxx b/include/osl/socket_decl.hxx
index 2bcbd6cbd575..38c9d7694c7f 100644
--- a/include/osl/socket_decl.hxx
+++ b/include/osl/socket_decl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_SOCKET_DECL_HXX_
-#define _OSL_SOCKET_DECL_HXX_
+#ifndef INCLUDED_OSL_SOCKET_DECL_HXX
+#define INCLUDED_OSL_SOCKET_DECL_HXX
 
 #include <osl/socket.h>
 #include <rtl/ustring.hxx>
diff --git a/include/osl/thread.h b/include/osl/thread.h
index bc93a57b1735..23a52e422c5c 100644
--- a/include/osl/thread.h
+++ b/include/osl/thread.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_THREAD_H_
-#define _OSL_THREAD_H_
+#ifndef INCLUDED_OSL_THREAD_H
+#define INCLUDED_OSL_THREAD_H
 
 #include "sal/config.h"
 
@@ -191,6 +191,6 @@ SAL_DLLPUBLIC rtl_TextEncoding SAL_CALL osl_setThreadTextEncoding(rtl_TextEncodi
 }
 #endif
 
-#endif  /* _OSL_THREAD_H_ */
+#endif // INCLUDED_OSL_THREAD_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/thread.hxx b/include/osl/thread.hxx
index 3a1b73e829ef..571ea1fc2663 100644
--- a/include/osl/thread.hxx
+++ b/include/osl/thread.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _THREAD_HXX_
-#define _THREAD_HXX_
+#ifndef INCLUDED_OSL_THREAD_HXX
+#define INCLUDED_OSL_THREAD_HXX
 
 #include "sal/config.h"