diff --git a/tools/nfdc/face-module.cpp b/tools/nfdc/face-module.cpp
index 4d9d3a2..446a281 100644
--- a/tools/nfdc/face-module.cpp
+++ b/tools/nfdc/face-module.cpp
@@ -24,8 +24,7 @@
  */
 
 #include "face-module.hpp"
-#include "canonizer.hpp"
-#include "find-face.hpp"
+#include "face-helpers.hpp"
 
 #include <boost/lexical_cast/try_lexical_convert.hpp>
 
@@ -368,7 +367,7 @@
                         const CommandOptions& options)
 {
   controller.fetch<ndn::nfd::FaceDataset>(
-    [this, onSuccess] (const std::vector<FaceStatus>& result) {
+    [this, onSuccess] (const auto& result) {
       m_status = result;
       onSuccess();
     },