face: Stop using shared_ptr to manage acceptors

This commit also includes a major cleanup of all channels.

Change-Id: I10db9709e0cba6a0691a86482c60b5dbb2956f68
Refs: #2613
diff --git a/tests/daemon/face/tcp.t.cpp b/tests/daemon/face/tcp.t.cpp
index ee2eb41..9ee9881 100644
--- a/tests/daemon/face/tcp.t.cpp
+++ b/tests/daemon/face/tcp.t.cpp
@@ -23,16 +23,19 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "face/tcp-channel.hpp"
+#include "face/tcp-face.hpp"
 #include "face/tcp-factory.hpp"
-#include <ndn-cxx/util/dns.hpp>
-#include "core/network-interface.hpp"
-#include <ndn-cxx/security/key-chain.hpp>
 
+#include "core/network-interface.hpp"
 #include "tests/test-common.hpp"
 #include "tests/limited-io.hpp"
 #include "dummy-stream-sender.hpp"
 #include "packet-datasets.hpp"
 
+#include <ndn-cxx/security/key-chain.hpp>
+#include <ndn-cxx/util/dns.hpp>
+
 namespace nfd {
 namespace tests {