diff --git a/src/gcc_atomic.h b/src/gcc_atomic.h
index 842a48fb..276acdc9 100644
--- a/src/gcc_atomic.h
+++ b/src/gcc_atomic.h
@@ -12,8 +12,8 @@
  *    limitations under the License.
  */
 
-#ifndef MSGPACK_GCC_ATOMIC_H__
-#define MSGPACK_GCC_ATOMIC_H__
+#ifndef MSGPACK_GCC_ATOMIC_H
+#define MSGPACK_GCC_ATOMIC_H
 
 #if defined(__cplusplus)
 extern "C" {
@@ -30,4 +30,4 @@ int _msgpack_sync_incr_and_fetch(volatile _msgpack_atomic_counter_t* ptr);
 #endif
 
 
-#endif // MSGPACK_GCC_ATOMIC_H__
+#endif // MSGPACK_GCC_ATOMIC_H
diff --git a/src/msgpack/object.h b/src/msgpack/object.h
index baeeb9b2..86927c39 100644
--- a/src/msgpack/object.h
+++ b/src/msgpack/object.h
@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_OBJECT_H__
-#define MSGPACK_OBJECT_H__
+#ifndef MSGPACK_OBJECT_H
+#define MSGPACK_OBJECT_H
 
 #include "zone.h"
 #include <stdio.h>
diff --git a/src/msgpack/object.hpp b/src/msgpack/object.hpp
index 790a1f53..1f2de2b5 100644
--- a/src/msgpack/object.hpp
+++ b/src/msgpack/object.hpp
@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_OBJECT_HPP__
-#define MSGPACK_OBJECT_HPP__
+#ifndef MSGPACK_OBJECT_HPP
+#define MSGPACK_OBJECT_HPP
 
 #include "object.h"
 #include "pack.hpp"
diff --git a/src/msgpack/pack.h b/src/msgpack/pack.h
index 2502bd6a..691a89d4 100644
--- a/src/msgpack/pack.h
+++ b/src/msgpack/pack.h
@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_PACK_H__
-#define MSGPACK_PACK_H__
+#ifndef MSGPACK_PACK_H
+#define MSGPACK_PACK_H
 
 #include "pack_define.h"
 #include "object.h"
diff --git a/src/msgpack/pack_define.h b/src/msgpack/pack_define.h
index 4845d52e..991ee5c5 100644
--- a/src/msgpack/pack_define.h
+++ b/src/msgpack/pack_define.h
@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_PACK_DEFINE_H__
-#define MSGPACK_PACK_DEFINE_H__
+#ifndef MSGPACK_PACK_DEFINE_H
+#define MSGPACK_PACK_DEFINE_H
 
 #include "msgpack/sysdep.h"
 #include <limits.h>
diff --git a/src/msgpack/sbuffer.h b/src/msgpack/sbuffer.h
index 4ffb0b7c..5a18cf38 100644
--- a/src/msgpack/sbuffer.h
+++ b/src/msgpack/sbuffer.h
@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_SBUFFER_H__
-#define MSGPACK_SBUFFER_H__
+#ifndef MSGPACK_SBUFFER_H
+#define MSGPACK_SBUFFER_H
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/msgpack/sysdep.h b/src/msgpack/sysdep.h
index 3c1f8718..f4776718 100644
--- a/src/msgpack/sysdep.h
+++ b/src/msgpack/sysdep.h
@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_SYSDEP_H__
-#define MSGPACK_SYSDEP_H__
+#ifndef MSGPACK_SYSDEP_H
+#define MSGPACK_SYSDEP_H
 
 #include <stdlib.h>
 #include <stddef.h>
diff --git a/src/msgpack/type/bool.hpp b/src/msgpack/type/bool.hpp
index 9433a982..c689f643 100644
--- a/src/msgpack/type/bool.hpp
+++ b/src/msgpack/type/bool.hpp
@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_BOOL_HPP__
-#define MSGPACK_TYPE_BOOL_HPP__
+#ifndef MSGPACK_TYPE_BOOL_HPP
+#define MSGPACK_TYPE_BOOL_HPP
 
 #include "msgpack/object.hpp"
 #include <vector>
diff --git a/src/msgpack/type/define.hpp.erb b/src/msgpack/type/define.hpp.erb
index cc06be9c..331bbce4 100644
--- a/src/msgpack/type/define.hpp.erb
+++ b/src/msgpack/type/define.hpp.erb
@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_DEFINE_HPP__
-#define MSGPACK_TYPE_DEFINE_HPP__
+#ifndef MSGPACK_TYPE_DEFINE_HPP
+#define MSGPACK_TYPE_DEFINE_HPP
 
 #define MSGPACK_DEFINE(...) \
 	template <typename Packer> \
diff --git a/src/msgpack/type/deque.hpp b/src/msgpack/type/deque.hpp
index d21ceeae..dcce1dc7 100644
--- a/src/msgpack/type/deque.hpp
+++ b/src/msgpack/type/deque.hpp
@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_DEQUE_HPP__
-#define MSGPACK_TYPE_DEQUE_HPP__
+#ifndef MSGPACK_TYPE_DEQUE_HPP
+#define MSGPACK_TYPE_DEQUE_HPP
 
 #include "msgpack/object.hpp"
 #include <deque>
diff --git a/src/msgpack/type/fixint.hpp b/src/msgpack/type/fixint.hpp
index ebe2696f..4f0289da 100644
--- a/src/msgpack/type/fixint.hpp
+++ b/src/msgpack/type/fixint.hpp
@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_FIXINT_HPP__
-#define MSGPACK_TYPE_FIXINT_HPP__
+#ifndef MSGPACK_TYPE_FIXINT_HPP
+#define MSGPACK_TYPE_FIXINT_HPP
 
 #include "msgpack/object.hpp"
 #include "msgpack/type/int.hpp"
diff --git a/src/msgpack/type/float.hpp b/src/msgpack/type/float.hpp
index 6ba06d5c..823757cd 100644
--- a/src/msgpack/type/float.hpp
+++ b/src/msgpack/type/float.hpp
@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_FLOAT_HPP__
-#define MSGPACK_TYPE_FLOAT_HPP__
+#ifndef MSGPACK_TYPE_FLOAT_HPP
+#define MSGPACK_TYPE_FLOAT_HPP
 
 #include "msgpack/object.hpp"
 #include <vector>
diff --git a/src/msgpack/type/int.hpp b/src/msgpack/type/int.hpp
index 6a1477ee..b1af29fe 100644
--- a/src/msgpack/type/int.hpp
+++ b/src/msgpack/type/int.hpp
@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_INT_HPP__
-#define MSGPACK_TYPE_INT_HPP__
+#ifndef MSGPACK_TYPE_INT_HPP
+#define MSGPACK_TYPE_INT_HPP
 
 #include "msgpack/object.hpp"
 #include <limits>
diff --git a/src/msgpack/type/list.hpp b/src/msgpack/type/list.hpp
index c0f8ce63..0c246f6a 100644
--- a/src/msgpack/type/list.hpp
+++ b/src/msgpack/type/list.hpp
@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_LIST_HPP__
-#define MSGPACK_TYPE_LIST_HPP__
+#ifndef MSGPACK_TYPE_LIST_HPP
+#define MSGPACK_TYPE_LIST_HPP
 
 #include "msgpack/object.hpp"
 #include <list>
diff --git a/src/msgpack/type/map.hpp b/src/msgpack/type/map.hpp
index 958447d5..b58f5f58 100644
--- a/src/msgpack/type/map.hpp
+++ b/src/msgpack/type/map.hpp
@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_MAP_HPP__
-#define MSGPACK_TYPE_MAP_HPP__
+#ifndef MSGPACK_TYPE_MAP_HPP
+#define MSGPACK_TYPE_MAP_HPP
 
 #include "msgpack/object.hpp"
 #include <map>
diff --git a/src/msgpack/type/nil.hpp b/src/msgpack/type/nil.hpp
index f44e45e4..1b69f3c1 100644
--- a/src/msgpack/type/nil.hpp
+++ b/src/msgpack/type/nil.hpp
@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_NIL_HPP__
-#define MSGPACK_TYPE_NIL_HPP__
+#ifndef MSGPACK_TYPE_NIL_HPP
+#define MSGPACK_TYPE_NIL_HPP
 
 #include "msgpack/object.hpp"
 
diff --git a/src/msgpack/type/pair.hpp b/src/msgpack/type/pair.hpp
index 296a8b64..7ed57388 100644
--- a/src/msgpack/type/pair.hpp
+++ b/src/msgpack/type/pair.hpp
@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_PAIR_HPP__
-#define MSGPACK_TYPE_PAIR_HPP__
+#ifndef MSGPACK_TYPE_PAIR_HPP
+#define MSGPACK_TYPE_PAIR_HPP
 
 #include "msgpack/object.hpp"
 #include <utility>
diff --git a/src/msgpack/type/raw.hpp b/src/msgpack/type/raw.hpp
index 87d188f6..0f296236 100644
--- a/src/msgpack/type/raw.hpp
+++ b/src/msgpack/type/raw.hpp
@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_RAW_HPP__
-#define MSGPACK_TYPE_RAW_HPP__
+#ifndef MSGPACK_TYPE_RAW_HPP
+#define MSGPACK_TYPE_RAW_HPP
 
 #include "msgpack/object.hpp"
 #include <string.h>
diff --git a/src/msgpack/type/set.hpp b/src/msgpack/type/set.hpp
index bcf1030a..5aa9f2ae 100644
--- a/src/msgpack/type/set.hpp
+++ b/src/msgpack/type/set.hpp
@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_SET_HPP__
-#define MSGPACK_TYPE_SET_HPP__
+#ifndef MSGPACK_TYPE_SET_HPP
+#define MSGPACK_TYPE_SET_HPP
 
 #include "msgpack/object.hpp"
 #include <set>
diff --git a/src/msgpack/type/string.hpp b/src/msgpack/type/string.hpp
index 37d4a172..870517d2 100644
--- a/src/msgpack/type/string.hpp
+++ b/src/msgpack/type/string.hpp
@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_STRING_HPP__
-#define MSGPACK_TYPE_STRING_HPP__
+#ifndef MSGPACK_TYPE_STRING_HPP
+#define MSGPACK_TYPE_STRING_HPP
 
 #include "msgpack/object.hpp"
 #include <string>
diff --git a/src/msgpack/type/tr1/unordered_map.hpp b/src/msgpack/type/tr1/unordered_map.hpp
index f485c89a..88c61a87 100644
--- a/src/msgpack/type/tr1/unordered_map.hpp
+++ b/src/msgpack/type/tr1/unordered_map.hpp
@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_TR1_UNORDERED_MAP_HPP__
-#define MSGPACK_TYPE_TR1_UNORDERED_MAP_HPP__
+#ifndef MSGPACK_TYPE_TR1_UNORDERED_MAP_HPP
+#define MSGPACK_TYPE_TR1_UNORDERED_MAP_HPP
 
 #include "msgpack/object.hpp"
 
diff --git a/src/msgpack/type/tr1/unordered_set.hpp b/src/msgpack/type/tr1/unordered_set.hpp
index 252ae233..33c35929 100644
--- a/src/msgpack/type/tr1/unordered_set.hpp
+++ b/src/msgpack/type/tr1/unordered_set.hpp
@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_TR1_UNORDERED_SET_HPP__
-#define MSGPACK_TYPE_TR1_UNORDERED_SET_HPP__
+#ifndef MSGPACK_TYPE_TR1_UNORDERED_SET_HPP
+#define MSGPACK_TYPE_TR1_UNORDERED_SET_HPP
 
 #include "msgpack/object.hpp"
 
diff --git a/src/msgpack/type/tuple.hpp.erb b/src/msgpack/type/tuple.hpp.erb
index 1ba6dc1b..f4a691ca 100644
--- a/src/msgpack/type/tuple.hpp.erb
+++ b/src/msgpack/type/tuple.hpp.erb
@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_TUPLE_HPP__
-#define MSGPACK_TYPE_TUPLE_HPP__
+#ifndef MSGPACK_TYPE_TUPLE_HPP
+#define MSGPACK_TYPE_TUPLE_HPP
 
 #include "msgpack/object.hpp"
 
diff --git a/src/msgpack/type/vector.hpp b/src/msgpack/type/vector.hpp
index bd073ef8..ae2da47f 100644
--- a/src/msgpack/type/vector.hpp
+++ b/src/msgpack/type/vector.hpp
@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_VECTOR_HPP__
-#define MSGPACK_TYPE_VECTOR_HPP__
+#ifndef MSGPACK_TYPE_VECTOR_HPP
+#define MSGPACK_TYPE_VECTOR_HPP
 
 #include "msgpack/object.hpp"
 #include <vector>
diff --git a/src/msgpack/unpack.h b/src/msgpack/unpack.h
index c3380f81..c90e95af 100644
--- a/src/msgpack/unpack.h
+++ b/src/msgpack/unpack.h
@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_UNPACKER_H__
-#define MSGPACK_UNPACKER_H__
+#ifndef MSGPACK_UNPACKER_H
+#define MSGPACK_UNPACKER_H
 
 #include "zone.h"
 #include "object.h"
diff --git a/src/msgpack/unpack_define.h b/src/msgpack/unpack_define.h
index c6ecb90d..4c0b9c65 100644
--- a/src/msgpack/unpack_define.h
+++ b/src/msgpack/unpack_define.h
@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_UNPACK_DEFINE_H__
-#define MSGPACK_UNPACK_DEFINE_H__
+#ifndef MSGPACK_UNPACK_DEFINE_H
+#define MSGPACK_UNPACK_DEFINE_H
 
 #include "msgpack/sysdep.h"
 #include <stdlib.h>
diff --git a/src/msgpack/version.h.in b/src/msgpack/version.h.in
index f1feb331..418ae4a2 100644
--- a/src/msgpack/version.h.in
+++ b/src/msgpack/version.h.in
@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_VERSION_H__
-#define MSGPACK_VERSION_H__
+#ifndef MSGPACK_VERSION_H
+#define MSGPACK_VERSION_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/msgpack/vrefbuffer.h b/src/msgpack/vrefbuffer.h
index 23022a84..cc912b35 100644
--- a/src/msgpack/vrefbuffer.h
+++ b/src/msgpack/vrefbuffer.h
@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_VREFBUFFER_H__
-#define MSGPACK_VREFBUFFER_H__
+#ifndef MSGPACK_VREFBUFFER_H
+#define MSGPACK_VREFBUFFER_H
 
 #include "zone.h"
 #include <stdlib.h>
diff --git a/src/msgpack/zbuffer.h b/src/msgpack/zbuffer.h
index 965d389b..d7f65ce9 100644
--- a/src/msgpack/zbuffer.h
+++ b/src/msgpack/zbuffer.h
@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_ZBUFFER_H__
-#define MSGPACK_ZBUFFER_H__
+#ifndef MSGPACK_ZBUFFER_H
+#define MSGPACK_ZBUFFER_H
 
 #include "sysdep.h"
 #include <stdlib.h>
diff --git a/src/msgpack/zone.h b/src/msgpack/zone.h
index aa2a1470..1f68a3c4 100644
--- a/src/msgpack/zone.h
+++ b/src/msgpack/zone.h
@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_ZONE_H__
-#define MSGPACK_ZONE_H__
+#ifndef MSGPACK_ZONE_H
+#define MSGPACK_ZONE_H
 
 #include "sysdep.h"