diff --git a/common.hpp b/common.hpp
index f308e3a..13203cc 100644
--- a/common.hpp
+++ b/common.hpp
@@ -24,16 +24,16 @@
 
 #include "config.hpp"
 
-#ifdef WITH_TESTS
-#define VIRTUAL_WITH_TESTS virtual
-#define PUBLIC_WITH_TESTS_ELSE_PROTECTED public
-#define PUBLIC_WITH_TESTS_ELSE_PRIVATE public
-#define PROTECTED_WITH_TESTS_ELSE_PRIVATE protected
+#ifdef NSL_HAVE_TESTS
+#define NSL_VIRTUAL_WITH_TESTS virtual
+#define NSL_PUBLIC_WITH_TESTS_ELSE_PROTECTED public
+#define NSL_PUBLIC_WITH_TESTS_ELSE_PRIVATE public
+#define NSL_PROTECTED_WITH_TESTS_ELSE_PRIVATE protected
 #else
-#define VIRTUAL_WITH_TESTS
-#define PUBLIC_WITH_TESTS_ELSE_PROTECTED protected
-#define PUBLIC_WITH_TESTS_ELSE_PRIVATE private
-#define PROTECTED_WITH_TESTS_ELSE_PRIVATE private
+#define NSL_VIRTUAL_WITH_TESTS
+#define NSL_PUBLIC_WITH_TESTS_ELSE_PROTECTED protected
+#define NSL_PUBLIC_WITH_TESTS_ELSE_PRIVATE private
+#define NSL_PROTECTED_WITH_TESTS_ELSE_PRIVATE private
 #endif
 
 #include <cstddef>
@@ -61,26 +61,28 @@
 using boost::noncopyable;
 using boost::scoped_ptr;
 
-using ndn::shared_ptr;
-using ndn::weak_ptr;
-using ndn::enable_shared_from_this;
-using ndn::make_shared;
-using ndn::static_pointer_cast;
-using ndn::dynamic_pointer_cast;
-using ndn::const_pointer_cast;
-using ndn::function;
-using ndn::bind;
-using ndn::ref;
-using ndn::cref;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::enable_shared_from_this;
+using std::make_shared;
+using std::static_pointer_cast;
+using std::dynamic_pointer_cast;
+using std::const_pointer_cast;
+using std::function;
+using std::bind;
+using std::ref;
+using std::cref;
 
 using ndn::Interest;
 using ndn::Data;
 using ndn::Name;
 using ndn::Exclude;
 using ndn::Block;
+using ndn::Signature;
+using ndn::KeyLocator;
 
 namespace tlv {
-using namespace ndn::Tlv;
+using namespace ndn::tlv;
 }
 
 namespace name = ndn::name;