diff --git a/src/tags.hpp b/src/tags.hpp
index 2ee27039..3c0a90ac 100644
--- a/src/tags.hpp
+++ b/src/tags.hpp
@@ -21,13 +21,13 @@
 /*!
   @file    tags.hpp
   @brief   %Exif tag and type information
-  @version $Name:  $ $Revision: 1.5 $
+  @version $Name:  $ $Revision: 1.6 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    15-Jan-03, ahu: created
  */
-#ifndef _TAGS_HPP_
-#define _TAGS_HPP_
+#ifndef TAGS_HPP_
+#define TAGS_HPP_
 
 // *****************************************************************************
 // included header files
@@ -192,4 +192,4 @@ namespace Exif {
 
 }                                       // namespace Exif
 
-#endif                                  // #ifndef _TAGS_HPP_
+#endif                                  // #ifndef TAGS_HPP_
diff --git a/src/utils.hpp b/src/utils.hpp
index 741d59de..be7b6c43 100644
--- a/src/utils.hpp
+++ b/src/utils.hpp
@@ -21,13 +21,13 @@
 /*!
   @file    utils.hpp
   @brief   A collection of utility functions
-  @version $Name:  $ $Revision: 1.3 $
+  @version $Name:  $ $Revision: 1.4 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    12-Dec-03, ahu: created
  */
-#ifndef _UTILS_HPP_
-#define _UTILS_HPP_
+#ifndef UTILS_HPP_
+#define UTILS_HPP_
 
 // *********************************************************************
 // included header files
@@ -169,4 +169,4 @@ private:
 
 }                                       // namespace Util
 
-#endif                                  // #ifndef _UTILS_HPP_
+#endif                                  // #ifndef UTILS_HPP_