diff --git a/test/cpp/src/TestClient.cpp b/test/cpp/src/TestClient.cpp
index 7e37e85..417a7a1 100644
--- a/test/cpp/src/TestClient.cpp
+++ b/test/cpp/src/TestClient.cpp
@@ -92,8 +92,6 @@
 
   shared_ptr<TBufferBase> transport;
 
-  shared_ptr<TSocket> socket(new TSocket(host, port));
-
   if (framed) {
     shared_ptr<TFramedTransport> framedSocket(new TFramedTransport(socket));
     transport = framedSocket;
diff --git a/test/cpp/src/TestServer.cpp b/test/cpp/src/TestServer.cpp
index 047dd33..8401647 100644
--- a/test/cpp/src/TestServer.cpp
+++ b/test/cpp/src/TestServer.cpp
@@ -25,6 +25,8 @@
 #include <server/TThreadPoolServer.h>
 #include <server/TNonblockingServer.h>
 #include <transport/TServerSocket.h>
+#include <transport/TSSLServerSocket.h>
+#include <transport/TSSLSocket.h>
 #include <transport/TTransportUtils.h>
 #include "ThriftTest.h"
 
diff --git a/test/cpp/src/main.cpp b/test/cpp/src/main.cpp
index c4124c3..0c91956 100644
--- a/test/cpp/src/main.cpp
+++ b/test/cpp/src/main.cpp
@@ -38,11 +38,7 @@
 #include <set>
 #include <stdexcept>
 #include <sstream>
-
 #include <map>
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-using __gnu_cxx::hash;
 
 using namespace std;
 using namespace boost;
@@ -325,7 +321,7 @@
       workerCount = atoi(args["workers"].c_str());
     }
 
-  } catch(exception& e) {
+  } catch(std::exception& e) {
     cerr << e.what() << endl;
     cerr << usage;
   }
diff --git a/test/cpp/src/nb-main.cpp b/test/cpp/src/nb-main.cpp
index 6887e4e..7650d49 100644
--- a/test/cpp/src/nb-main.cpp
+++ b/test/cpp/src/nb-main.cpp
@@ -42,11 +42,7 @@
 #include <set>
 #include <stdexcept>
 #include <sstream>
-
 #include <map>
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-using __gnu_cxx::hash;
 
 using namespace std;
 using namespace boost;
@@ -320,7 +316,7 @@
       workerCount = atoi(args["workers"].c_str());
     }
 
-  } catch(exception& e) {
+  } catch(std::exception& e) {
     cerr << e.what() << endl;
     cerr << usage;
   }