diff --git a/fairmq/FairMQChannel.h b/fairmq/FairMQChannel.h
index 8dcad3f1..3f500bb0 100644
--- a/fairmq/FairMQChannel.h
+++ b/fairmq/FairMQChannel.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -9,11 +9,9 @@
 #ifndef FAIRMQCHANNEL_H_
 #define FAIRMQCHANNEL_H_
 
-#if 0
 #ifndef FAIR_MQ_CHANNEL_H
 #pragma GCC warning "Deprecated header: Use <fairmq/Channel.h> instead"
 #endif
-#endif
 
 #include <fairmq/Channel.h>
 
diff --git a/fairmq/FairMQDevice.h b/fairmq/FairMQDevice.h
index 2be20ceb..24c60862 100644
--- a/fairmq/FairMQDevice.h
+++ b/fairmq/FairMQDevice.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2012-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2012-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -9,11 +9,9 @@
 #ifndef FAIRMQDEVICE_H_
 #define FAIRMQDEVICE_H_
 
-#if 0
 #ifndef FAIR_MQ_DEVICE_H
 #pragma GCC warning "Deprecated header: Use <fairmq/Device.h> instead"
 #endif
-#endif
 
 #include <fairmq/Device.h>
 
diff --git a/fairmq/FairMQLogger.h b/fairmq/FairMQLogger.h
index 090753fd..0d5f63dd 100644
--- a/fairmq/FairMQLogger.h
+++ b/fairmq/FairMQLogger.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2017-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -9,6 +9,8 @@
 #ifndef FAIRMQLOGGER_H_
 #define FAIRMQLOGGER_H_
 
+#pragma GCC warning "Deprecated header: Use <fairlogger/Logger.h> instead"
+
 #include <fairlogger/Logger.h>
 
 #endif /* FAIRMQLOGGER_H_ */
diff --git a/fairmq/FairMQMessage.h b/fairmq/FairMQMessage.h
index 08f809ca..3ab7bdd8 100644
--- a/fairmq/FairMQMessage.h
+++ b/fairmq/FairMQMessage.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -9,11 +9,9 @@
 #ifndef FAIRMQMESSAGE_H_
 #define FAIRMQMESSAGE_H_
 
-#if 0
 #ifndef FAIR_MQ_MESSAGE_H
 #pragma GCC warning "Deprecated header: Use <fairmq/Message.h> instead"
 #endif
-#endif
 
 #include <fairmq/Message.h>
 
diff --git a/fairmq/FairMQParts.h b/fairmq/FairMQParts.h
index dce68a46..ebdf636e 100644
--- a/fairmq/FairMQParts.h
+++ b/fairmq/FairMQParts.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -9,11 +9,9 @@
 #ifndef FAIRMQPARTS_H_
 #define FAIRMQPARTS_H_
 
-#if 0
 #ifndef FAIR_MQ_PARTS_H
 #pragma GCC warning "Deprecated header: Use <fairmq/Parts.h> instead"
 #endif
-#endif
 
 #include <fairmq/Parts.h>
 
diff --git a/fairmq/FairMQPoller.h b/fairmq/FairMQPoller.h
index 5e9d91bf..432b686c 100644
--- a/fairmq/FairMQPoller.h
+++ b/fairmq/FairMQPoller.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -9,11 +9,9 @@
 #ifndef FAIRMQPOLLER_H_
 #define FAIRMQPOLLER_H_
 
-#if 0
 #ifndef FAIR_MQ_POLLER_H
 #pragma GCC warning "Deprecated header: Use <fairmq/Poller.h> instead"
 #endif
-#endif
 
 #include <fairmq/Poller.h>
 
diff --git a/fairmq/FairMQSocket.h b/fairmq/FairMQSocket.h
index d94cb657..5c81e480 100644
--- a/fairmq/FairMQSocket.h
+++ b/fairmq/FairMQSocket.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -9,11 +9,9 @@
 #ifndef FAIRMQSOCKET_H_
 #define FAIRMQSOCKET_H_
 
-#if 0
 #ifndef FAIR_MQ_SOCKET_H
 #pragma GCC warning "Deprecated header: Use <fairmq/Socket.h> instead"
 #endif
-#endif
 
 #include <fairmq/Socket.h>
 
diff --git a/fairmq/FairMQTransportFactory.h b/fairmq/FairMQTransportFactory.h
index 9799f585..3d2a536f 100644
--- a/fairmq/FairMQTransportFactory.h
+++ b/fairmq/FairMQTransportFactory.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -9,11 +9,9 @@
 #ifndef FAIRMQTRANSPORTFACTORY_H_
 #define FAIRMQTRANSPORTFACTORY_H_
 
-#if 0
 #ifndef FAIR_MQ_TRANSPORTFACTORY_H
 #pragma GCC warning "Deprecated header: Use <fairmq/TransportFactory.h> instead"
 #endif
-#endif
 
 #include <fairmq/TransportFactory.h>
 
diff --git a/fairmq/FairMQUnmanagedRegion.h b/fairmq/FairMQUnmanagedRegion.h
index 7a5bade2..c9a9a31e 100644
--- a/fairmq/FairMQUnmanagedRegion.h
+++ b/fairmq/FairMQUnmanagedRegion.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -9,11 +9,9 @@
 #ifndef FAIRMQUNMANAGEDREGION_H_
 #define FAIRMQUNMANAGEDREGION_H_
 
-#if 0
 #ifndef FAIR_MQ_UNMANAGEDREGION_H
 #pragma GCC warning "Deprecated header: Use <fairmq/UnmanagedRegion.h> instead"
 #endif
-#endif
 
 #include <fairmq/UnmanagedRegion.h>
 
diff --git a/fairmq/options/FairMQProgOptions.h b/fairmq/options/FairMQProgOptions.h
index 4c9846dd..20ca1673 100644
--- a/fairmq/options/FairMQProgOptions.h
+++ b/fairmq/options/FairMQProgOptions.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -9,6 +9,10 @@
 #ifndef FAIRMQPROGOPTIONS_H
 #define FAIRMQPROGOPTIONS_H
 
+#ifndef FAIR_MQ_PROGOPTIONS_H
+#pragma GCC warning "Deprecated header: Use <fairmq/ProgOptions.h> instead"
+#endif
+
 #include <fairmq/ProgOptions.h>
 
 #endif /* FAIRMQPROGOPTIONS_H */