diff --git a/examples/echo_server/Makefile b/examples/echo_server/Makefile
index f7be740eca..eeb0b216d1 100644
--- a/examples/echo_server/Makefile
+++ b/examples/echo_server/Makefile
@@ -1,4 +1,4 @@
-CFLAGS = -O2 -std=c++0x
+CFLAGS = -O2
 LDFLAGS = 
 
 CXX		?= c++
diff --git a/src/connection.hpp b/src/connection.hpp
index 61816ed064..4e10036a64 100644
--- a/src/connection.hpp
+++ b/src/connection.hpp
@@ -72,8 +72,8 @@ public:
 		
 	// friends (would require C++11) this would enable connection::start to be 
 	// protected instead of public.
-	friend typename endpoint_traits<endpoint_type>::role_type;
-	friend typename endpoint_traits<endpoint_type>::socket_type;
+	//friend typename endpoint_traits<endpoint_type>::role_type;
+	//friend typename endpoint_traits<endpoint_type>::socket_type;
 	//friend class role<endpoint>;
 	//friend class socket<endpoint>;