diff --git a/lib/cpp/src/server/TServer.h b/lib/cpp/src/server/TServer.h
index 0d275ba..f34944b 100644
--- a/lib/cpp/src/server/TServer.h
+++ b/lib/cpp/src/server/TServer.h
@@ -3,6 +3,10 @@
 
 #include "TProcessor.h"
 
+namespace facebook { namespace thrift { namespace server { 
+
+using namespace facebook::thrift;
+
 class TServerOptions;
 
 /**
@@ -33,4 +37,6 @@
   // TODO(mcslee): Fill data members in here
 };
 
+}}} // facebook::thrift::server
+
 #endif
diff --git a/lib/cpp/src/server/TSimpleServer.cc b/lib/cpp/src/server/TSimpleServer.cc
index 03069ae..7199ab9 100644
--- a/lib/cpp/src/server/TSimpleServer.cc
+++ b/lib/cpp/src/server/TSimpleServer.cc
@@ -5,6 +5,8 @@
 #include <iostream>
 using namespace std;
 
+namespace facebook { namespace thrift { namespace server { 
+
 /**
  * A simple single-threaded application server. Perfect for unit tests!
  *
@@ -52,3 +54,5 @@
 
   // TODO(mcslee): Could this be a timeout case? Or always the real thing?
 }
+
+}}} // facebook::thrift::server
diff --git a/lib/cpp/src/server/TSimpleServer.h b/lib/cpp/src/server/TSimpleServer.h
index 9e0f79f..a4a2d98 100644
--- a/lib/cpp/src/server/TSimpleServer.h
+++ b/lib/cpp/src/server/TSimpleServer.h
@@ -4,6 +4,8 @@
 #include "server/TServer.h"
 #include "transport/TServerTransport.h"
 
+namespace facebook { namespace thrift { namespace server { 
+
 /**
  * This is the most basic simple server. It is single-threaded and runs a
  * continuous loop of accepting a single connection, processing requests on
@@ -27,4 +29,6 @@
   TServerTransport* serverTransport_;
 };
 
+}}} // facebook::thrift::server
+
 #endif