diff --git a/contrib/async-test/test-server.cpp b/contrib/async-test/test-server.cpp
index a55c348..b304e1b 100644
--- a/contrib/async-test/test-server.cpp
+++ b/contrib/async-test/test-server.cpp
@@ -1,8 +1,8 @@
 #include <tr1/functional>
-#include "protocol/TBinaryProtocol.h"
-#include "async/TAsyncProtocolProcessor.h"
-#include "async/TEvhttpServer.h"
-#include "async/TEvhttpClientChannel.h"
+#include <thrift/protocol/TBinaryProtocol.h>
+#include <thrift/async/TAsyncProtocolProcessor.h>
+#include <thrift/async/TEvhttpServer.h>
+#include <thrift/async/TEvhttpClientChannel.h>
 #include "Aggr.h"
 
 using std::tr1::bind;
diff --git a/contrib/fb303/TClientInfo.cpp b/contrib/fb303/TClientInfo.cpp
index e07eaa8..5959fb1 100644
--- a/contrib/fb303/TClientInfo.cpp
+++ b/contrib/fb303/TClientInfo.cpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <server/TClientInfo.h>
+#include <thrift/server/TClientInfo.h>
 
 namespace apache { namespace thrift { namespace server {
 
diff --git a/contrib/fb303/TClientInfo.h b/contrib/fb303/TClientInfo.h
index 9b2d284..d0a9770 100644
--- a/contrib/fb303/TClientInfo.h
+++ b/contrib/fb303/TClientInfo.h
@@ -22,9 +22,9 @@
 
 // for inet_ntop --
 #include <arpa/inet.h>
-#include <server/TServer.h>
-#include <transport/TSocket.h>
-#include <concurrency/Mutex.h>
+#include <thrift/server/TServer.h>
+#include <thrift/transport/TSocket.h>
+#include <thrift/concurrency/Mutex.h>
 
 namespace apache { namespace thrift { namespace server {
 
diff --git a/contrib/fb303/cpp/FacebookBase.h b/contrib/fb303/cpp/FacebookBase.h
index fd169e6..2159c95 100644
--- a/contrib/fb303/cpp/FacebookBase.h
+++ b/contrib/fb303/cpp/FacebookBase.h
@@ -22,8 +22,8 @@
 
 #include "FacebookService.h"
 
-#include "server/TServer.h"
-#include "concurrency/Mutex.h"
+#include <thrift/server/TServer.h>
+#include <thrift/concurrency/Mutex.h>
 
 #include <time.h>
 #include <string>
diff --git a/contrib/fb303/cpp/ServiceTracker.cpp b/contrib/fb303/cpp/ServiceTracker.cpp
index c20a068..2914ff6 100644
--- a/contrib/fb303/cpp/ServiceTracker.cpp
+++ b/contrib/fb303/cpp/ServiceTracker.cpp
@@ -21,7 +21,7 @@
 
 #include "FacebookBase.h"
 #include "ServiceTracker.h"
-#include "concurrency/ThreadManager.h"
+#include <thrift/concurrency/ThreadManager.h>
 
 using namespace std;
 using namespace facebook::fb303;
diff --git a/contrib/fb303/cpp/ServiceTracker.h b/contrib/fb303/cpp/ServiceTracker.h
index 9304386..9a3edd8 100644
--- a/contrib/fb303/cpp/ServiceTracker.h
+++ b/contrib/fb303/cpp/ServiceTracker.h
@@ -100,7 +100,7 @@
 #include <map>
 #include <boost/shared_ptr.hpp>
 
-#include "concurrency/Mutex.h"
+#include <thrift/concurrency/Mutex.h>
 
 
 namespace apache { namespace thrift { namespace concurrency {
diff --git a/contrib/thrift_dump.cpp b/contrib/thrift_dump.cpp
index 0ddfcec..59c8ac8 100644
--- a/contrib/thrift_dump.cpp
+++ b/contrib/thrift_dump.cpp
@@ -20,11 +20,11 @@
 #include <cstdlib>
 #include <iostream>
 
-#include <transport/TBufferTransports.h>
-#include <transport/TFDTransport.h>
-#include <protocol/TBinaryProtocol.h>
-#include <protocol/TDebugProtocol.h>
-#include <protocol/TProtocolTap.h>
+#include <thrift/transport/TBufferTransports.h>
+#include <thrift/transport/TFDTransport.h>
+#include <thrift/protocol/TBinaryProtocol.h>
+#include <thrift/protocol/TDebugProtocol.h>
+#include <thrift/protocol/TProtocolTap.h>
 
 using namespace std;
 using boost::shared_ptr;
diff --git a/contrib/zeromq/TZmqClient.h b/contrib/zeromq/TZmqClient.h
index 9544503..9fcfc06 100644
--- a/contrib/zeromq/TZmqClient.h
+++ b/contrib/zeromq/TZmqClient.h
@@ -21,7 +21,7 @@
 #define _THRIFT_TRANSPORT_TZMQCLIENT_H_ 1
 
 #include <zmq.hpp>
-#include <transport/TBufferTransports.h>
+#include <thrift/transport/TBufferTransports.h>
 
 namespace apache { namespace thrift { namespace transport {
 
diff --git a/contrib/zeromq/TZmqServer.cpp b/contrib/zeromq/TZmqServer.cpp
index c6142d7..f255a66 100644
--- a/contrib/zeromq/TZmqServer.cpp
+++ b/contrib/zeromq/TZmqServer.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "TZmqServer.h"
-#include <transport/TBufferTransports.h>
+#include <thrift/transport/TBufferTransports.h>
 #include <boost/scoped_ptr.hpp>
 
 using boost::shared_ptr;
diff --git a/contrib/zeromq/TZmqServer.h b/contrib/zeromq/TZmqServer.h
index 1603eac..f91c6e8 100644
--- a/contrib/zeromq/TZmqServer.h
+++ b/contrib/zeromq/TZmqServer.h
@@ -21,7 +21,7 @@
 #define _THRIFT_SERVER_TZMQSERVER_H_ 1
 
 #include <zmq.hpp>
-#include <server/TServer.h>
+#include <thrift/server/TServer.h>
 
 namespace apache { namespace thrift { namespace server {
 
diff --git a/contrib/zeromq/test-client.cpp b/contrib/zeromq/test-client.cpp
index 64e20f6..d2fc56c 100644
--- a/contrib/zeromq/test-client.cpp
+++ b/contrib/zeromq/test-client.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <cstdlib>
-#include <protocol/TBinaryProtocol.h>
+#include <thrift/protocol/TBinaryProtocol.h>
 
 #include "zmq.hpp"
 #include "TZmqClient.h"
diff --git a/contrib/zeromq/test-sender.cpp b/contrib/zeromq/test-sender.cpp
index ca05709..6b0eef1 100644
--- a/contrib/zeromq/test-sender.cpp
+++ b/contrib/zeromq/test-sender.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <cstdlib>
-#include <protocol/TBinaryProtocol.h>
+#include <thrift/protocol/TBinaryProtocol.h>
 
 #include "zmq.hpp"
 #include "TZmqClient.h"