diff --git a/Makefile b/Makefile
index e81b3fc4e6ba01eb9639400323077d702160f315..2227865990f37a9d1f2ca49ffcaab4002e03edcb 100644
--- a/Makefile
+++ b/Makefile
@@ -4,30 +4,30 @@ INST_NAME=test
 DEBUG_LEV=-v3
 INSTALL_DIR=/usr/local/bin
 #================================================================================
-INC_DIR=/usr/local/omniORB-4.1.7/include \
-	   /usr/local/zeromq-3.2.3/include/zmq \
-	   /usr/local/tango-8.1.2/include/tango \
-	   /usr/local/soci-3.2.1/include \
-	   /usr/local/soci-3.2.1/include/soci \
+INC_DIR=/usr/local/omniORB/include \
+	   /usr/local/zeromq/include/zmq \
+	   /usr/local/tango/include/tango \
+	   /usr/local/soci/include \
+	   /usr/local/soci/include/soci \
 	   /usr/include/mysql \
-	   /usr/local/protobuf-2.5.0/include \
+	   /usr/local/protobuf/include \
 	   ./src
-LIB_DIR=/usr/local/omniORB-4.1.7/lib \
-	   /usr/local/zeromq-3.2.3/lib \
-	   /usr/local/tango-8.1.2/lib \
-	   /usr/local/soci-3.2.1/lib64 \
-	   /usr/local/protobuf-2.5.0/lib
+LIB_DIR=/usr/local/omniORB/lib \
+	   /usr/local/zeromq/lib \
+	   /usr/local/tango/lib \
+	   /usr/local/soci/lib64 \
+	   /usr/local/protobuf/lib
 #================================================================================
 CC=g++
 CXX_DEBUG_FLAGS=-g -DVERBOSE_DEBUG
 CXX_RELEASE_FLAGS=-O3
-CXX_DEFAULT_FLAGS=-c -Wall -Wextra -std=c++11 -std=gnu++11
+CXX_DEFAULT_FLAGS=-c -Wall -Wextra -std=c++0x
 LDFLAGS=-Wall -lomniORB4 -lomniDynamic4 -lCOS4 -lomnithread -ltango -llog4tango \
 	-lsoci_core -lsoci_mysql -lboost_system -lboost_thread -lboost_filesystem \
 	-lboost_date_time-mt -lprotobuf -lssl
 INC_PARM=$(foreach d, $(INC_DIR), -I$d)
 LIB_PARM=$(foreach d, $(LIB_DIR), -L$d)
-PROTOC :=/usr/local/protobuf-2.5.0/bin/protoc
+PROTOC :=/usr/local/protobuf/bin/protoc
 #================================================================================
 SRC_DIR=./src
 OBJ_DIR=./obj
diff --git a/src/DBManager.h b/src/DBManager.h
index 4315538039e5a5f8c0bc617c62282ec2312ed4b2..798cd6a88329fee713ea8ac5e49ea151c4bfed36 100644
--- a/src/DBManager.h
+++ b/src/DBManager.h
@@ -41,7 +41,7 @@ protected:
     virtual ~DBManager();
 
     class Deleter;
-    friend Deleter;
+    friend class Deleter;
     class Deleter
     {
         public:
diff --git a/src/FileWrapper.h b/src/FileWrapper.h
index cbc5b23a57ca879753bd1f8d09115fde7d1471dd..35ffd9e9630e912e378818ca3a6eec5e7ee16c1d 100644
--- a/src/FileWrapper.h
+++ b/src/FileWrapper.h
@@ -27,7 +27,7 @@ protected:
     virtual ~FileWrapper();
 
     class Deleter;
-    friend Deleter;
+    friend class Deleter;
     class Deleter
     {
         public:
diff --git a/src/PlainServer.h b/src/PlainServer.h
index f3655b6d937f6a3c689a3f481d78f346aab374bc..5a92b2734e7117534a4965e81e3369b2b025dea3 100644
--- a/src/PlainServer.h
+++ b/src/PlainServer.h
@@ -17,7 +17,7 @@ class PlainServer : public Server
     virtual ~PlainServer();
 
     class Deleter;
-    friend Deleter;
+    friend class Deleter;
     class Deleter
     {
 	public:
diff --git a/src/PlainSession.h b/src/PlainSession.h
index a0fa74af35038ae64f5c5a2e1bd0ebbe035a80e2..7e7839e678224b0ee19f50c819698801a422eebc 100644
--- a/src/PlainSession.h
+++ b/src/PlainSession.h
@@ -23,7 +23,7 @@ protected:
     virtual ~PlainSession();
 
     class Deleter;
-    friend Deleter;
+    friend class Deleter;
     class Deleter
     {
 	public:
diff --git a/src/ProtocolManager.h b/src/ProtocolManager.h
index e8da5e69a6a8dc4d7369b851b9d26f615955aa17..315778df0cfbb25528b02a7f9e608b58b7c9d707 100644
--- a/src/ProtocolManager.h
+++ b/src/ProtocolManager.h
@@ -37,7 +37,7 @@ protected:
     virtual ~ProtocolManager();
 
     class Deleter;
-    friend Deleter;
+    friend class Deleter;
     class Deleter
     {
         public:
diff --git a/src/SSLServer.h b/src/SSLServer.h
index db74b716e4f5796389850a344dccdc7224dc4151..c10dcc8274ec1e7f30d4670a321d9e48f462e3e3 100644
--- a/src/SSLServer.h
+++ b/src/SSLServer.h
@@ -19,7 +19,7 @@ class SSLServer : public Server
     virtual ~SSLServer();
 
     class Deleter;
-    friend Deleter;
+    friend class Deleter;
     class Deleter
     {
 	public: