diff --git a/lib/cpp/src/protocol/TBinaryProtocol.h b/lib/cpp/src/protocol/TBinaryProtocol.h
index d66fa2f..5bca6dd 100644
--- a/lib/cpp/src/protocol/TBinaryProtocol.h
+++ b/lib/cpp/src/protocol/TBinaryProtocol.h
@@ -1,5 +1,5 @@
-#ifndef T_BINARY_PROTOCOL_H
-#define T_BINARY_PROTOCOL_H
+#ifndef _THRIFT_PROTOCOL_TBINARYPROTOCOL_H_
+#define _THRIFT_PROTOCOL_TBINARYPROTOCOL_H_ 1
 
 #include "TProtocol.h"
 
@@ -147,5 +147,6 @@
 
 }}} // facebook::thrift::protocol
 
-#endif
+#endif // #ifndef _THRIFT_PROTOCOL_TBINARYPROTOCOL_H_
+
 
diff --git a/lib/cpp/src/protocol/TProtocol.h b/lib/cpp/src/protocol/TProtocol.h
index e9d560c..65d6f3c 100644
--- a/lib/cpp/src/protocol/TProtocol.h
+++ b/lib/cpp/src/protocol/TProtocol.h
@@ -1,5 +1,5 @@
-#ifndef T_PROTOCOL_H
-#define T_PROTOCOL_H
+#ifndef _THRIFT_PROTOCOL_TPROTOCOL_H_
+#define _THRIFT_PROTOCOL_TPROTOCOL_H_ 1
 
 #include <transport/TTransport.h>
 
@@ -20,7 +20,7 @@
 
 #define htonll(x) ntohll(x)
 
-/** Forward declaration for TProtocol */
+// Forward declaration for TProtocol
 struct TBuf;
 
 /**
@@ -49,7 +49,8 @@
 };
 
 /**
- * Enumerated definition of the message types that the Thrift protocol supports.
+ * Enumerated definition of the message types that the Thrift protocol
+ * supports.
  */
 enum TMessageType {
   T_CALL       = 1,
@@ -297,5 +298,4 @@
 
 }}} // facebook::thrift::protocol
 
-#endif
-
+#endif // #define _THRIFT_PROTOCOL_TPROTOCOL_H_ 1