diff --git a/examples/echo_server/echo.hpp b/examples/echo_server/echo.hpp
index a6aac7a373..40214a5ba4 100644
--- a/examples/echo_server/echo.hpp
+++ b/examples/echo_server/echo.hpp
@@ -28,39 +28,5 @@
 #ifndef ECHO_SERVER_HANDLER_HPP
 #define ECHO_SERVER_HANDLER_HPP
 
-#include "../../src/websocketpp.hpp"
-#include "../../src/interfaces/session.hpp"
-#include <boost/shared_ptr.hpp>
-
-#include <string>
-#include <vector>
-
-using websocketpp::session::server_ptr;
-using websocketpp::session::server_handler;
-
-namespace websocketecho {
-
-class echo_server_handler : public server_handler {
-public:
-    // The echo server allows all domains is protocol free.
-    void validate(server_ptr session) {}
-    
-    // an echo server is stateless. 
-    // The handler has no need to keep track of connected clients.
-    void on_fail(server_ptr session) {}
-    void on_open(server_ptr session) {}
-    void on_close(server_ptr session) {}
-    
-    // both text and binary messages are echoed back to the sending client.
-        void on_message(server_ptr session,websocketpp::utf8_string_ptr msg) {
-        std::cout << *msg << std::endl;
-        session->send(*msg);
-    }
-    void on_message(server_ptr session,websocketpp::binary_string_ptr data) {
-        session->send(*data);
-    }
-};
-
-}
 
 #endif // ECHO_SERVER_HANDLER_HPP
diff --git a/examples/echo_server/echo_server.cpp b/examples/echo_server/echo_server.cpp
index 3a644b897f..7bb907af9a 100644
--- a/examples/echo_server/echo_server.cpp
+++ b/examples/echo_server/echo_server.cpp
@@ -33,8 +33,8 @@ using websocketpp::server;
 
 class echo_server_handler : public server::handler {
 public:
-    void on_message(connection_ptr connection,message_ptr msg) {
-        connection->send(msg->get_payload(),msg->get_opcode());
+    void on_message(connection_ptr con, message_ptr msg) {
+        con->send(msg->get_payload(),msg->get_opcode());
     }
 };