core: drop std::function and ndn::Exclude from common.hpp, add ndn::optional
Change-Id: Ie3983d8b6f9929430efd8ada8d942e3f95755cd4
diff --git a/core/common.hpp b/core/common.hpp
index cde5437..156d59d 100644
--- a/core/common.hpp
+++ b/core/common.hpp
@@ -59,7 +59,6 @@
#include <ndn-cxx/data.hpp>
#include <ndn-cxx/delegation.hpp>
#include <ndn-cxx/delegation-list.hpp>
-#include <ndn-cxx/exclude.hpp>
#include <ndn-cxx/interest.hpp>
#include <ndn-cxx/name.hpp>
#include <ndn-cxx/encoding/block.hpp>
@@ -92,18 +91,18 @@
using std::dynamic_pointer_cast;
using std::const_pointer_cast;
-using std::function;
using std::bind;
-using std::ref;
using std::cref;
+using std::ref;
+using ndn::optional;
+using ndn::nullopt;
using ndn::to_string;
using ndn::Block;
using ndn::Data;
using ndn::Delegation;
using ndn::DelegationList;
-using ndn::Exclude;
using ndn::FaceUri;
using ndn::Interest;
using ndn::Name;