diff --git a/lib/cpp/src/protocol/TBinaryProtocol.cc b/lib/cpp/src/protocol/TBinaryProtocol.cc
index 6ac028a..ed482b8 100644
--- a/lib/cpp/src/protocol/TBinaryProtocol.cc
+++ b/lib/cpp/src/protocol/TBinaryProtocol.cc
@@ -1,6 +1,8 @@
 #include "protocol/TBinaryProtocol.h"
 using std::string;
 
+namespace facebook { namespace thrift { namespace protocol { 
+
 uint32_t TBinaryProtocol::writeStructBegin(TTransport* out,
                                            const string& name) const {
   return 0;
@@ -249,3 +251,4 @@
 
   return result + (uint32_t)size;
 }
+}}} // facebook::thrift::protocol
diff --git a/lib/cpp/src/protocol/TBinaryProtocol.h b/lib/cpp/src/protocol/TBinaryProtocol.h
index ea0bd25..0f0560a 100644
--- a/lib/cpp/src/protocol/TBinaryProtocol.h
+++ b/lib/cpp/src/protocol/TBinaryProtocol.h
@@ -3,6 +3,8 @@
 
 #include "protocol/TProtocol.h"
 
+namespace facebook { namespace thrift { namespace protocol { 
+
 /**
  * The default binary protocol for thrift. Writes all data in a very basic
  * binary format, essentially just spitting out the raw bytes.
@@ -124,4 +126,7 @@
 
 };
 
+}}} // facebook::thrift::protocol
+
 #endif
+
diff --git a/lib/cpp/src/protocol/TProtocol.h b/lib/cpp/src/protocol/TProtocol.h
index 0007406..40beadd 100644
--- a/lib/cpp/src/protocol/TProtocol.h
+++ b/lib/cpp/src/protocol/TProtocol.h
@@ -8,6 +8,10 @@
 
 #include "transport/TTransport.h"
 
+namespace facebook { namespace thrift { namespace protocol { 
+
+using namespace facebook::thrift::transport;
+
 #define ntohll(x) (((uint64_t)(ntohl((int)((x << 32) >> 32))) << 32) | (uint32_t)ntohl(((int)(x >> 32))))
 
 #define htonll(x) ntohll(x)
@@ -260,4 +264,7 @@
   TProtocol() {}
 };
 
+}}} // facebook::thrift::protocol
+
 #endif
+