diff --git a/plugin/handler_socket/CMakeLists.txt b/plugin/handler_socket/CMakeLists.txt
index 5a1925b40e0..1510dc839a4 100644
--- a/plugin/handler_socket/CMakeLists.txt
+++ b/plugin/handler_socket/CMakeLists.txt
@@ -6,8 +6,6 @@ IF(WIN32 OR WITHOUT_SERVER)
   RETURN()
 ENDIF()
 
-MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-deprecated-declarations")
-
 INCLUDE_DIRECTORIES(libhsclient)
 
 # Handlersocket client library. We do not distribute it, 
diff --git a/plugin/handler_socket/handlersocket/database.hpp b/plugin/handler_socket/handlersocket/database.hpp
index ed5d00800d9..9e2aadf7380 100644
--- a/plugin/handler_socket/handlersocket/database.hpp
+++ b/plugin/handler_socket/handlersocket/database.hpp
@@ -9,6 +9,11 @@
 #ifndef DENA_DATABASE_HPP
 #define DENA_DATABASE_HPP
 
+#ifdef __GNUC__
+/* auto_ptr is deprecated */
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 #include <string>
 #include <memory>
 #include <vector>
diff --git a/plugin/handler_socket/libhsclient/hstcpcli.hpp b/plugin/handler_socket/libhsclient/hstcpcli.hpp
index fa0d4db1742..d078bdfd533 100644
--- a/plugin/handler_socket/libhsclient/hstcpcli.hpp
+++ b/plugin/handler_socket/libhsclient/hstcpcli.hpp
@@ -19,6 +19,11 @@
 #include "string_ref.hpp"
 #include "string_buffer.hpp"
 
+#ifdef __GNUC__
+/* auto_ptr is deprecated */
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 namespace dena {
 
 struct hstcpcli_filter {