diff --git a/daemon/face/generic-link-service.cpp b/daemon/face/generic-link-service.cpp
index d1536ce..a922cbe 100644
--- a/daemon/face/generic-link-service.cpp
+++ b/daemon/face/generic-link-service.cpp
@@ -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,
@@ -24,6 +24,7 @@
  */
 
 #include "generic-link-service.hpp"
+#include <ndn-cxx/lp/tags.hpp>
 
 namespace nfd {
 namespace face {
diff --git a/daemon/fw/client-control-strategy.cpp b/daemon/fw/client-control-strategy.cpp
index 147b936..0b1c5f5 100644
--- a/daemon/fw/client-control-strategy.cpp
+++ b/daemon/fw/client-control-strategy.cpp
@@ -25,6 +25,7 @@
 
 #include "client-control-strategy.hpp"
 #include "core/logger.hpp"
+#include <ndn-cxx/lp/tags.hpp>
 
 namespace nfd {
 namespace fw {
diff --git a/daemon/fw/forwarder.cpp b/daemon/fw/forwarder.cpp
index 502a071..f0186f5 100644
--- a/daemon/fw/forwarder.cpp
+++ b/daemon/fw/forwarder.cpp
@@ -29,6 +29,7 @@
 #include "core/random.hpp"
 #include "strategy.hpp"
 #include "table/cleanup.hpp"
+#include <ndn-cxx/lp/tags.hpp>
 #include <boost/random/uniform_int_distribution.hpp>
 
 namespace nfd {
diff --git a/daemon/mgmt/face-manager.cpp b/daemon/mgmt/face-manager.cpp
index f41f4de..2caa74c 100644
--- a/daemon/mgmt/face-manager.cpp
+++ b/daemon/mgmt/face-manager.cpp
@@ -31,6 +31,7 @@
 #include "face/udp-factory.hpp"
 #include "fw/face-table.hpp"
 
+#include <ndn-cxx/lp/tags.hpp>
 #include <ndn-cxx/management/nfd-channel-status.hpp>
 #include <ndn-cxx/management/nfd-face-status.hpp>
 #include <ndn-cxx/management/nfd-face-event-notification.hpp>
diff --git a/daemon/mgmt/fib-manager.cpp b/daemon/mgmt/fib-manager.cpp
index 9992789..623c71e 100644
--- a/daemon/mgmt/fib-manager.cpp
+++ b/daemon/mgmt/fib-manager.cpp
@@ -25,6 +25,7 @@
 
 #include "fib-manager.hpp"
 #include "fw/face-table.hpp"
+#include <ndn-cxx/lp/tags.hpp>
 #include <ndn-cxx/management/nfd-fib-entry.hpp>
 
 namespace nfd {
diff --git a/daemon/table/cs.cpp b/daemon/table/cs.cpp
index 19df21a..8578a0d 100644
--- a/daemon/table/cs.cpp
+++ b/daemon/table/cs.cpp
@@ -27,6 +27,7 @@
 #include "cs-policy-priority-fifo.hpp"
 #include "core/logger.hpp"
 #include "core/algorithm.hpp"
+#include <ndn-cxx/lp/tags.hpp>
 
 NFD_LOG_INIT("ContentStore");
 
diff --git a/rib/rib-manager.cpp b/rib/rib-manager.cpp
index d49f625..b291a22 100644
--- a/rib/rib-manager.cpp
+++ b/rib/rib-manager.cpp
@@ -27,6 +27,7 @@
 #include "core/global-io.hpp"
 #include "core/logger.hpp"
 #include "core/scheduler.hpp"
+#include <ndn-cxx/lp/tags.hpp>
 #include <ndn-cxx/management/nfd-face-status.hpp>
 #include <ndn-cxx/management/nfd-rib-entry.hpp>
 
diff --git a/tests/daemon/face/generic-link-service.t.cpp b/tests/daemon/face/generic-link-service.t.cpp
index 888c222..dc5a8cf 100644
--- a/tests/daemon/face/generic-link-service.t.cpp
+++ b/tests/daemon/face/generic-link-service.t.cpp
@@ -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,
@@ -26,6 +26,7 @@
 #include "face/generic-link-service.hpp"
 #include "face/face.hpp"
 #include "dummy-transport.hpp"
+#include <ndn-cxx/lp/tags.hpp>
 
 #include "tests/test-common.hpp"
 
diff --git a/tests/daemon/fw/client-control-strategy.t.cpp b/tests/daemon/fw/client-control-strategy.t.cpp
index 9f500e8..517d2aa 100644
--- a/tests/daemon/fw/client-control-strategy.t.cpp
+++ b/tests/daemon/fw/client-control-strategy.t.cpp
@@ -26,6 +26,7 @@
 #include "fw/client-control-strategy.hpp"
 #include "strategy-tester.hpp"
 #include "tests/daemon/face/dummy-face.hpp"
+#include <ndn-cxx/lp/tags.hpp>
 
 #include "tests/test-common.hpp"
 
diff --git a/tests/daemon/fw/forwarder.t.cpp b/tests/daemon/fw/forwarder.t.cpp
index 85be529..497952a 100644
--- a/tests/daemon/fw/forwarder.t.cpp
+++ b/tests/daemon/fw/forwarder.t.cpp
@@ -27,6 +27,7 @@
 #include "tests/daemon/face/dummy-face.hpp"
 #include "dummy-strategy.hpp"
 #include "install-strategy.hpp"
+#include <ndn-cxx/lp/tags.hpp>
 
 #include "tests/test-common.hpp"
 
diff --git a/tests/daemon/mgmt/face-manager-update-face.t.cpp b/tests/daemon/mgmt/face-manager-update-face.t.cpp
index 68ac36a..df1f97f 100644
--- a/tests/daemon/mgmt/face-manager-update-face.t.cpp
+++ b/tests/daemon/mgmt/face-manager-update-face.t.cpp
@@ -25,6 +25,7 @@
 
 #include "face-manager-command-fixture.hpp"
 #include "nfd-manager-common-fixture.hpp"
+#include <ndn-cxx/lp/tags.hpp>
 
 namespace nfd {
 namespace tests {
diff --git a/tests/daemon/mgmt/fib-manager.t.cpp b/tests/daemon/mgmt/fib-manager.t.cpp
index f03b7b9..fbea4c0 100644
--- a/tests/daemon/mgmt/fib-manager.t.cpp
+++ b/tests/daemon/mgmt/fib-manager.t.cpp
@@ -27,6 +27,7 @@
 #include "nfd-manager-common-fixture.hpp"
 #include "table/fib-nexthop.hpp"
 #include "../face/dummy-face.hpp"
+#include <ndn-cxx/lp/tags.hpp>
 #include <ndn-cxx/management/nfd-fib-entry.hpp>
 
 namespace nfd {
diff --git a/tests/daemon/table/cs.t.cpp b/tests/daemon/table/cs.t.cpp
index a4c5d74..8c9bbf5 100644
--- a/tests/daemon/table/cs.t.cpp
+++ b/tests/daemon/table/cs.t.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "table/cs.hpp"
+#include <ndn-cxx/lp/tags.hpp>
 #include <ndn-cxx/util/crypto.hpp>
 
 #include "tests/test-common.hpp"
diff --git a/tests/rib/rib-manager.t.cpp b/tests/rib/rib-manager.t.cpp
index 30d1e1e..cfe0b3f 100644
--- a/tests/rib/rib-manager.t.cpp
+++ b/tests/rib/rib-manager.t.cpp
@@ -26,6 +26,7 @@
 #include "rib/rib-manager.hpp"
 #include "manager-common-fixture.hpp"
 
+#include <ndn-cxx/lp/tags.hpp>
 #include <ndn-cxx/management/nfd-rib-entry.hpp>
 #include <ndn-cxx/management/nfd-face-status.hpp>
 #include <ndn-cxx/management/nfd-face-event-notification.hpp>