diff --git a/core/common.hpp b/core/common.hpp
index 437d355..b19a19c 100644
--- a/core/common.hpp
+++ b/core/common.hpp
@@ -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-2017,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -56,13 +56,15 @@
 #include <utility>
 #include <vector>
 
-#include <ndn-cxx/interest.hpp>
 #include <ndn-cxx/data.hpp>
+#include <ndn-cxx/exclude.hpp>
+#include <ndn-cxx/interest.hpp>
+#include <ndn-cxx/link.hpp>
 #include <ndn-cxx/name.hpp>
 #include <ndn-cxx/encoding/block.hpp>
 #include <ndn-cxx/lp/nack.hpp>
+#include <ndn-cxx/net/face-uri.hpp>
 #include <ndn-cxx/util/backports.hpp>
-#include <ndn-cxx/util/face-uri.hpp>
 #include <ndn-cxx/util/signal.hpp>
 
 #include <boost/asio.hpp>
@@ -96,14 +98,14 @@
 
 using ndn::to_string;
 
-using ndn::Interest;
+using ndn::Block;
 using ndn::Data;
+using ndn::Exclude;
+using ndn::FaceUri;
+using ndn::Interest;
 using ndn::Name;
 using ndn::PartialName;
-using ndn::Exclude;
 using ndn::Link;
-using ndn::Block;
-using ndn::util::FaceUri;
 
 namespace tlv {
 // Don't write "namespace tlv = ndn::tlv", because NFD can add other members into this namespace.
diff --git a/core/network-interface.hpp b/core/network-interface.hpp
index 32caaed..4fb76d1 100644
--- a/core/network-interface.hpp
+++ b/core/network-interface.hpp
@@ -28,14 +28,14 @@
 
 #include "common.hpp"
 
-#include <ndn-cxx/util/ethernet.hpp>
+#include <ndn-cxx/net/ethernet.hpp>
 
 #include <net/if.h>
 
 namespace nfd {
 
 namespace ethernet {
-using namespace ndn::util::ethernet;
+using namespace ndn::ethernet;
 } // namespace ethernet
 
 /** \brief contains information about a network interface