@@ -9,27 +9,24 @@
 
 namespace cucumber {
 
-using boost::shared_ptr;
-using boost::weak_ptr;
-
 namespace internal {
 
-typedef std::vector<shared_ptr<void> > contexts_type;
+typedef std::vector<boost::shared_ptr<void> > contexts_type;
 
 class ContextManager {
 public:
     void purgeContexts();
-    template<class T> weak_ptr<T> addContext();
+    template<class T> boost::weak_ptr<T> addContext();
 
 protected:
     static contexts_type contexts;
 };
 
 template<class T>
-weak_ptr<T> ContextManager::addContext() {
-    shared_ptr<T> shared(boost::make_shared<T>());
+boost::weak_ptr<T> ContextManager::addContext() {
+    boost::shared_ptr<T> shared(boost::make_shared<T>());
     contexts.push_back(shared);
-    return weak_ptr<T> (shared);
+    return boost::weak_ptr<T> (shared);
 }
 
 }
@@ -45,12 +42,12 @@ class ScenarioScope {
 
 private:
     internal::ContextManager contextManager;
-    shared_ptr<T> context;
-    static weak_ptr<T> contextReference;
+    boost::shared_ptr<T> context;
+    static boost::weak_ptr<T> contextReference;
 };
 
 template<class T>
-weak_ptr<T> ScenarioScope<T>::contextReference;
+boost::weak_ptr<T> ScenarioScope<T>::contextReference;
 
 template<class T>
 ScenarioScope<T>::ScenarioScope() {
 
@@ -10,12 +10,6 @@
 namespace cucumber {
 namespace internal {
 
-using namespace boost::asio;
-using namespace boost::asio::ip;
-#if defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)
-using namespace boost::asio::local;
-#endif
-
 /**
  * Socket server that calls a protocol handler line by line
  */
@@ -33,13 +27,13 @@ class SocketServer {
 
 protected:
     const ProtocolHandler *protocolHandler;
-    io_service ios;
+    boost::asio::io_service ios;
 
     template <typename Protocol, typename Service>
-    void doListen(basic_socket_acceptor<Protocol, Service>& acceptor,
+    void doListen(boost::asio::basic_socket_acceptor<Protocol, Service>& acceptor,
             const typename Protocol::endpoint& endpoint);
     template <typename Protocol, typename Service>
-    void doAcceptOnce(basic_socket_acceptor<Protocol, Service>& acceptor);
+    void doAcceptOnce(boost::asio::basic_socket_acceptor<Protocol, Service>& acceptor);
     void processStream(std::iostream &stream);
 };
 
@@ -66,7 +60,7 @@ class TCPSocketServer : public SocketServer {
     /**
      * Bind and listen to a TCP port on the given endpoint
      */
-    void listen(const tcp::endpoint endpoint);
+    void listen(const boost::asio::ip::tcp::endpoint endpoint);
 
     /**
      * Endpoint (IP address and port number) that this server is currently
@@ -75,12 +69,12 @@ class TCPSocketServer : public SocketServer {
      * @throw boost::system::system_error when not listening on any socket or
      *        the endpoint cannot be determined.
      */
-    tcp::endpoint listenEndpoint() const;
+    boost::asio::ip::tcp::endpoint listenEndpoint() const;
 
     virtual void acceptOnce();
 
 private:
-    tcp::acceptor acceptor;
+    boost::asio::ip::tcp::acceptor acceptor;
 };
 
 #if defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)
@@ -105,14 +99,14 @@ class UnixSocketServer : public SocketServer {
      * @throw boost::system::system_error when not listening on any socket or
      *        the endpoint cannot be determined.
      */
-    stream_protocol::endpoint listenEndpoint() const;
+    boost::asio::local::stream_protocol::endpoint listenEndpoint() const;
 
     virtual void acceptOnce();
 
     ~UnixSocketServer();
 
 private:
-    stream_protocol::acceptor acceptor;
+    boost::asio::local::stream_protocol::acceptor acceptor;
 };
 #endif
 
 
@@ -6,8 +6,7 @@
 #include "../step/StepManager.hpp"
 
 #include <boost/make_shared.hpp>
-#include <boost/smart_ptr.hpp>
-using boost::shared_ptr;
+#include <boost/shared_ptr.hpp>
 
 #include <list>
 
 
@@ -1,6 +1,5 @@
 #include <cucumber-cpp/internal/hook/HookRegistrar.hpp>
 #include <cucumber-cpp/internal/CukeCommands.hpp>
-#include <boost/make_shared.hpp>
 
 namespace cucumber {
 namespace internal {
 
@@ -4,6 +4,7 @@
 namespace cucumber {
 namespace internal {
 
+using namespace boost::asio;
 using namespace boost::asio::ip;
 #if defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)
 using namespace boost::asio::local;
 
@@ -27,7 +27,7 @@ void acceptWireProtocol(const std::string& host, int port, const std::string& un
     {
         TCPSocketServer* const tcpServer = new TCPSocketServer(&protocolHandler);
         server.reset(tcpServer);
-        tcpServer->listen(tcp::endpoint(boost::asio::ip::address::from_string(host), port));
+        tcpServer->listen(boost::asio::ip::tcp::endpoint(boost::asio::ip::address::from_string(host), port));
         if (verbose)
             std::clog << "Listening on " << tcpServer->listenEndpoint() << std::endl;
     }
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ void acceptWireProtocol(const std::string& host, int port, const std::string& un`
`27`	`27`	`{`
`28`	`28`	`TCPSocketServer* const tcpServer = new TCPSocketServer(&protocolHandler);`
`29`	`29`	`server.reset(tcpServer);`
`30`		`- tcpServer->listen(tcp::endpoint(boost::asio::ip::address::from_string(host), port));`
	`30`	`+ tcpServer->listen(boost::asio::ip::tcp::endpoint(boost::asio::ip::address::from_string(host), port));`
`31`	`31`	`if (verbose)`
`32`	`32`	`std::clog << "Listening on " << tcpServer->listenEndpoint() << std::endl;`
`33`	`33`	`}`