diff --git a/daemon/face/multicast-udp-transport.hpp b/daemon/face/multicast-udp-transport.hpp
index 2998f42..6da8fe6 100644
--- a/daemon/face/multicast-udp-transport.hpp
+++ b/daemon/face/multicast-udp-transport.hpp
@@ -34,7 +34,7 @@
 /**
  * \brief A Transport that communicates on a UDP multicast group
  */
-class MulticastUdpTransport DECL_FINAL : public DatagramTransport<boost::asio::ip::udp, Multicast>
+class MulticastUdpTransport DECL_CLASS_FINAL : public DatagramTransport<boost::asio::ip::udp, Multicast>
 {
 public:
   /**
diff --git a/daemon/face/tcp-transport.hpp b/daemon/face/tcp-transport.hpp
index b2d9fcf..7ddd648 100644
--- a/daemon/face/tcp-transport.hpp
+++ b/daemon/face/tcp-transport.hpp
@@ -33,7 +33,7 @@
 /**
  * \brief A Transport that communicates on a connected TCP socket
  */
-class TcpTransport DECL_FINAL : public StreamTransport<boost::asio::ip::tcp>
+class TcpTransport DECL_CLASS_FINAL : public StreamTransport<boost::asio::ip::tcp>
 {
 public:
   TcpTransport(protocol::socket&& socket,
diff --git a/daemon/face/unicast-udp-transport.hpp b/daemon/face/unicast-udp-transport.hpp
index 0c7c277..ab7adf2 100644
--- a/daemon/face/unicast-udp-transport.hpp
+++ b/daemon/face/unicast-udp-transport.hpp
@@ -35,7 +35,7 @@
 /**
  * \brief A Transport that communicates on a unicast UDP socket
  */
-class UnicastUdpTransport DECL_FINAL : public DatagramTransport<boost::asio::ip::udp, Unicast>
+class UnicastUdpTransport DECL_CLASS_FINAL : public DatagramTransport<boost::asio::ip::udp, Unicast>
 {
 public:
   UnicastUdpTransport(protocol::socket&& socket,
diff --git a/daemon/face/unix-stream-transport.hpp b/daemon/face/unix-stream-transport.hpp
index dc6e74e..30e8e98 100644
--- a/daemon/face/unix-stream-transport.hpp
+++ b/daemon/face/unix-stream-transport.hpp
@@ -38,7 +38,7 @@
 /**
  * \brief A Transport that communicates on a stream-oriented Unix domain socket
  */
-class UnixStreamTransport DECL_FINAL : public StreamTransport<boost::asio::local::stream_protocol>
+class UnixStreamTransport DECL_CLASS_FINAL : public StreamTransport<boost::asio::local::stream_protocol>
 {
 public:
   explicit
diff --git a/daemon/face/websocket-transport.hpp b/daemon/face/websocket-transport.hpp
index 08542c0..192c626 100644
--- a/daemon/face/websocket-transport.hpp
+++ b/daemon/face/websocket-transport.hpp
@@ -51,8 +51,8 @@
 
 /** \brief A Transport that communicates on a WebSocket connection
  */
-class WebSocketTransport DECL_FINAL : public Transport
-                                    , protected virtual WebSocketTransportCounters
+class WebSocketTransport DECL_CLASS_FINAL : public Transport
+                                          , protected virtual WebSocketTransportCounters
 {
 public:
   /** \brief counters provided by WebSocketTransport