diff --git a/daemon/table/cs.cpp b/daemon/table/cs.cpp
index 54466ed..c789567 100644
--- a/daemon/table/cs.cpp
+++ b/daemon/table/cs.cpp
@@ -25,14 +25,15 @@
 
 #include "cs.hpp"
 #include "core/algorithm.hpp"
-#include "core/asserts.hpp"
 #include "core/logger.hpp"
+
 #include <ndn-cxx/lp/tags.hpp>
+#include <ndn-cxx/util/concepts.hpp>
 
 namespace nfd {
 namespace cs {
 
-NFD_ASSERT_FORWARD_ITERATOR(Cs::const_iterator);
+NDN_CXX_ASSERT_FORWARD_ITERATOR(Cs::const_iterator);
 
 NFD_LOG_INIT("ContentStore");
 
diff --git a/daemon/table/fib.cpp b/daemon/table/fib.cpp
index c34fd12..0a9522a 100644
--- a/daemon/table/fib.cpp
+++ b/daemon/table/fib.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2016,  Regents of the University of California,
+/*
+ * Copyright (c) 2014-2018,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -26,12 +26,13 @@
 #include "fib.hpp"
 #include "pit-entry.hpp"
 #include "measurements-entry.hpp"
-#include "core/asserts.hpp"
+
+#include <ndn-cxx/util/concepts.hpp>
 
 namespace nfd {
 namespace fib {
 
-NFD_ASSERT_FORWARD_ITERATOR(Fib::const_iterator);
+NDN_CXX_ASSERT_FORWARD_ITERATOR(Fib::const_iterator);
 
 const unique_ptr<Entry> Fib::s_emptyEntry = make_unique<Entry>(Name());
 
diff --git a/daemon/table/name-tree-iterator.cpp b/daemon/table/name-tree-iterator.cpp
index 32f282d..9752ac7 100644
--- a/daemon/table/name-tree-iterator.cpp
+++ b/daemon/table/name-tree-iterator.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2016,  Regents of the University of California,
+/*
+ * Copyright (c) 2014-2018,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -25,14 +25,15 @@
 
 #include "name-tree-iterator.hpp"
 #include "name-tree.hpp"
-#include "core/asserts.hpp"
 #include "core/logger.hpp"
+
 #include <boost/range/concepts.hpp>
+#include <ndn-cxx/util/concepts.hpp>
 
 namespace nfd {
 namespace name_tree {
 
-NFD_ASSERT_FORWARD_ITERATOR(Iterator);
+NDN_CXX_ASSERT_FORWARD_ITERATOR(Iterator);
 BOOST_CONCEPT_ASSERT((boost::ForwardRangeConcept<Range>));
 
 NFD_LOG_INIT("NameTreeIterator");
diff --git a/daemon/table/pit-iterator.cpp b/daemon/table/pit-iterator.cpp
index 973342e..58777a7 100644
--- a/daemon/table/pit-iterator.cpp
+++ b/daemon/table/pit-iterator.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2016,  Regents of the University of California,
+/*
+ * Copyright (c) 2014-2018,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -24,12 +24,13 @@
  */
 
 #include "pit-iterator.hpp"
-#include "core/asserts.hpp"
+
+#include <ndn-cxx/util/concepts.hpp>
 
 namespace nfd {
 namespace pit {
 
-NFD_ASSERT_FORWARD_ITERATOR(Iterator);
+NDN_CXX_ASSERT_FORWARD_ITERATOR(Iterator);
 
 Iterator::Iterator(const NameTree::const_iterator& ntIt, size_t iPitEntry)
   : m_ntIt(ntIt)
diff --git a/daemon/table/strategy-choice.cpp b/daemon/table/strategy-choice.cpp
index 7d25b4b..8e026dc 100644
--- a/daemon/table/strategy-choice.cpp
+++ b/daemon/table/strategy-choice.cpp
@@ -26,19 +26,20 @@
 #include "strategy-choice.hpp"
 #include "measurements-entry.hpp"
 #include "pit-entry.hpp"
-#include "core/asserts.hpp"
 #include "core/logger.hpp"
 #include "fw/strategy.hpp"
 
+#include <ndn-cxx/util/concepts.hpp>
+
 namespace nfd {
 namespace strategy_choice {
 
-using fw::Strategy;
-
-NFD_ASSERT_FORWARD_ITERATOR(StrategyChoice::const_iterator);
+NDN_CXX_ASSERT_FORWARD_ITERATOR(StrategyChoice::const_iterator);
 
 NFD_LOG_INIT("StrategyChoice");
 
+using fw::Strategy;
+
 static inline bool
 nteHasStrategyChoiceEntry(const name_tree::Entry& nte)
 {