diff --git a/daemon/face/websocket-transport.hpp b/daemon/face/websocket-transport.hpp
index 192c626..ea67ea2 100644
--- a/daemon/face/websocket-transport.hpp
+++ b/daemon/face/websocket-transport.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014-2015,  Regents of the University of California,
+ * Copyright (c) 2014-2016,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -51,8 +51,8 @@
 
 /** \brief A Transport that communicates on a WebSocket connection
  */
-class WebSocketTransport DECL_CLASS_FINAL : public Transport
-                                          , protected virtual WebSocketTransportCounters
+class WebSocketTransport final : public Transport
+                               , protected virtual WebSocketTransportCounters
 {
 public:
   /** \brief counters provided by WebSocketTransport
@@ -64,7 +64,7 @@
                      time::milliseconds pingInterval);
 
   virtual const Counters&
-  getCounters() const DECL_OVERRIDE;
+  getCounters() const override;
 
   /** \brief Translates a message into a Block
    *         and delivers it to the link service
@@ -80,14 +80,14 @@
 
 protected:
   virtual void
-  beforeChangePersistency(ndn::nfd::FacePersistency newPersistency) DECL_FINAL;
+  beforeChangePersistency(ndn::nfd::FacePersistency newPersistency) final;
 
   virtual void
-  doClose() DECL_FINAL;
+  doClose() final;
 
 private:
   virtual void
-  doSend(Transport::Packet&& packet) DECL_FINAL;
+  doSend(Transport::Packet&& packet) final;
 
   void
   schedulePing();