diff --git a/src/ndncert-common.hpp b/src/ndncert-common.hpp
index 519b00f..b7e4a60 100644
--- a/src/ndncert-common.hpp
+++ b/src/ndncert-common.hpp
@@ -18,8 +18,8 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#ifndef NDNCERT_COMMON_HPP
-#define NDNCERT_COMMON_HPP
+#ifndef NDNCERT_NDNCERT_COMMON_HPP
+#define NDNCERT_NDNCERT_COMMON_HPP
 
 #include "ndncert-config.hpp"
 
@@ -49,13 +49,13 @@
 #include <ndn-cxx/interest.hpp>
 #include <ndn-cxx/data.hpp>
 #include <ndn-cxx/name.hpp>
+#include <ndn-cxx/face.hpp>
+#include <ndn-cxx/link.hpp>
 #include <ndn-cxx/encoding/block.hpp>
 #include <ndn-cxx/lp/nack.hpp>
 #include <ndn-cxx/util/backports.hpp>
-#include <ndn-cxx/util/face-uri.hpp>
 #include <ndn-cxx/util/signal.hpp>
-#include <ndn-cxx/security/v2/key-chain.hpp>
-#include <ndn-cxx/security/validator.hpp>
+#include <ndn-cxx/security/key-chain.hpp>
 #include <ndn-cxx/security/v2/certificate.hpp>
 
 #include <boost/algorithm/string.hpp>
@@ -94,4 +94,4 @@
 } // namespace ndncert
 } // namespace ndn
 
-#endif // NDNCERT_COMMON_HPP
+#endif // NDNCERT_NDNCERT_COMMON_HPP
diff --git a/tests/test-common.cpp b/tests/test-common.cpp
index 8214cf5..42cbf37 100644
--- a/tests/test-common.cpp
+++ b/tests/test-common.cpp
@@ -27,7 +27,7 @@
 
 #include "test-common.hpp"
 
-#include <ndn-cxx/util/digest.hpp>
+#include <ndn-cxx/util/sha256.hpp>
 #include <ndn-cxx/security/signature-sha256-with-rsa.hpp>
 
 namespace ndn {
@@ -106,7 +106,7 @@
 }
 
 shared_ptr<Link>
-makeLink(const Name& name, std::initializer_list<std::pair<uint32_t, Name>> delegations)
+makeLink(const Name& name, std::initializer_list<Delegation> delegations)
 {
   auto link = make_shared<Link>(name, delegations);
   signData(link);
diff --git a/tests/test-common.hpp b/tests/test-common.hpp
index 2d2ab6a..3d5dec1 100644
--- a/tests/test-common.hpp
+++ b/tests/test-common.hpp
@@ -36,6 +36,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 
+#include <ndn-cxx/link.hpp>
 #include <ndn-cxx/name.hpp>
 #include <ndn-cxx/data.hpp>
 #include <ndn-cxx/lp/nack.hpp>
@@ -132,7 +133,7 @@
  *        If a real signature is desired, sign again with KeyChain.
  */
 shared_ptr<Link>
-makeLink(const Name& name, std::initializer_list<std::pair<uint32_t, Name>> delegations);
+makeLink(const Name& name, std::initializer_list<Delegation> delegations);
 
 /** \brief create a Nack
  *  \param name Interest name
@@ -175,6 +176,4 @@
 } // namespace ndncert
 } // namespace ndn
 
-#include "identity-management-fixture.hpp"
-
 #endif // NDNCERT_TESTS_TEST_COMMON_HPP
diff --git a/tools/ndncert-ca-server.cpp b/tools/ndncert-ca-server.cpp
index e61f5b5..c757d45 100644
--- a/tools/ndncert-ca-server.cpp
+++ b/tools/ndncert-ca-server.cpp
@@ -20,6 +20,8 @@
 
 #include "ca-module.hpp"
 
+#include <iostream>
+
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/variables_map.hpp>
 #include <boost/program_options/parsers.hpp>
diff --git a/tools/ndncert-ca-status.cpp b/tools/ndncert-ca-status.cpp
index 09fd64a..a55812e 100644
--- a/tools/ndncert-ca-status.cpp
+++ b/tools/ndncert-ca-status.cpp
@@ -21,6 +21,8 @@
 #include "ca-module.hpp"
 #include "ca-detail/ca-sqlite.hpp"
 
+#include <iostream>
+
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/variables_map.hpp>
 #include <boost/program_options/parsers.hpp>
diff --git a/tools/ndncert-client.cpp b/tools/ndncert-client.cpp
index 86ff60f..7f082d8 100644
--- a/tools/ndncert-client.cpp
+++ b/tools/ndncert-client.cpp
@@ -22,6 +22,8 @@
 #include "challenge-module.hpp"
 #include "logging.hpp"
 
+#include <iostream>
+
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/variables_map.hpp>
 #include <boost/program_options/parsers.hpp>