diff --git a/Makefile b/Makefile
index 5ce7b357c7d9671a448d6a11749b9832c36692e7..03653ae1df47a5961ec77f00776e9f7f056103cd 100644
--- a/Makefile
+++ b/Makefile
@@ -27,11 +27,12 @@ LIB_DIR=/usr/local/omniORB/lib \
 CC=g++
 CXX_DEBUG_FLAGS=-g -DVERBOSE_DEBUG
 CXX_RELEASE_FLAGS=-O3
-CXX_DEFAULT_FLAGS=-c -Wall -Wextra -std=c++0x -Wno-deprecated-declarations -Wno-unused-local-typedefs -DHAVE_BOOST -DBOOST_BIND_GLOBAL_PLACEHOLDERS
+CXX_DEFAULT_FLAGS=-c -Wall -Wextra -std=c++0x -Wno-unused-local-typedefs -DHAVE_BOOST
 LDFLAGS=-Wall -lomniORB4 -lomniDynamic4 -lCOS4 -lomnithread -ltango -llog4tango \
 	-lsoci_core -lsoci_mysql -lmariadbclient -lboost_system -lboost_thread \
 	-lboost_filesystem -lboost_date_time -lprotobuf -lssl -lcrypto -lpthread
-INC_PARM=$(foreach d, $(INC_DIR), -I$d)
+INC_NO_WARNINGS=-isystem /usr/local/tango/include/tango 
+INC_PARM=$(foreach d, $(INC_DIR), -I$d) $(INC_NO_WARNINGS)
 LIB_PARM=$(foreach d, $(LIB_DIR), -L$d)
 PROTOC :=/usr/bin/protoc
 #================================================================================