diff --git a/fairmq/FairMQStateMachine.h b/fairmq/FairMQStateMachine.h
index 5fd19c21..d89ffe6a 100644
--- a/fairmq/FairMQStateMachine.h
+++ b/fairmq/FairMQStateMachine.h
@@ -71,7 +71,6 @@ _Pragma("clang diagnostic ignored \"-Wnon-virtual-dtor\"")
 #elif defined(__GNUC__) || defined(__GNUG__)
 _Pragma("GCC diagnostic push")
 _Pragma("GCC diagnostic ignored \"-Wnon-virtual-dtor\"")
-_Pragma("GCC diagnostic ignored \"-Weffc++\"")
 #endif
 
 // defining the boost MSM state machine
diff --git a/fairmq/logger/logger.h b/fairmq/logger/logger.h
index 317c3a66..c56eb34f 100644
--- a/fairmq/logger/logger.h
+++ b/fairmq/logger/logger.h
@@ -99,18 +99,9 @@ void DefaultAddFileSink(const std::string& filename, SeverityLevel level);
 } // namespace mq
 } // namespace fair
 
-#if defined(__GNUC__) || defined(__GNUG__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Weffc++"
-#endif
-
 // register a global logger (declaration)
 BOOST_LOG_GLOBAL_LOGGER(global_logger, boost::log::sources::severity_logger_mt<fair::mq::logger::SeverityLevel>)
 
-#if defined(__GNUC__) || defined(__GNUG__)
-#pragma GCC diagnostic pop
-#endif
-
 // helper macros
 
 // global macros (core). Level filters are set globally here, that is to all register sinks
diff --git a/fairmq/options/FairProgOptionsHelper.h b/fairmq/options/FairProgOptionsHelper.h
index 49cbfe3b..cc770c55 100644
--- a/fairmq/options/FairProgOptionsHelper.h
+++ b/fairmq/options/FairProgOptionsHelper.h
@@ -86,11 +86,6 @@ inline std::string ConvertVariableValueToString<boost::filesystem::path>(const p
     return valueStr;
 }
 
-#if defined(__GNUC__) || defined(__GNUG__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Weffc++"
-#endif
-
 // policy to convert boost variable value into string
 struct ToString
 {
@@ -235,10 +230,6 @@ struct ConvertVariableValue : T
     }
 };
 
-#if defined(__GNUC__) || defined(__GNUG__)
-#pragma GCC diagnostic pop
-#endif
-
 } // FairMQ namespace
 
 #endif /* FAIRPROGOPTIONSHELPER_H */