use FaceUri and NetworkMonitor from ndn-cxx/net
This commit also contains a quick fix in LpReliability to avoid
ndn::lp::Packet::wireEncode(EncodingEstimator&).
refs #3940, #4156
Change-Id: Ice8e3649be21dd023ed1f6562c185f9e6721e45e
diff --git a/tools/ndn-autoconfig/base.hpp b/tools/ndn-autoconfig/base.hpp
index a293d0b..5c9d4cf 100644
--- a/tools/ndn-autoconfig/base.hpp
+++ b/tools/ndn-autoconfig/base.hpp
@@ -31,8 +31,8 @@
#include <ndn-cxx/face.hpp>
#include <ndn-cxx/mgmt/nfd/controller.hpp>
#include <ndn-cxx/mgmt/nfd/face-status.hpp>
+#include <ndn-cxx/net/face-uri.hpp>
#include <ndn-cxx/security/key-chain.hpp>
-#include <ndn-cxx/util/face-uri.hpp>
namespace ndn {
namespace tools {
@@ -40,7 +40,6 @@
using ndn::nfd::ControlParameters;
using ndn::nfd::ControlResponse;
-using ndn::util::FaceUri;
/**
* @brief Base class for discovery stages