diff --git a/tools/Makefile.am b/tools/Makefile.am
index 216bb82..3b9d701 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,11 +1,10 @@
+LDADD = ../libndn-cpp-dev.la @BOOST_SYSTEM_LIB@
 
 bin_PROGRAMS = tlvdump ndncatchunks ndnputchunks
 
-tlvdump_SOURCES = tlvdump.cpp
-tlvdump_LDADD = ../libndn-cpp.la @BOOST_SYSTEM_LIB@
+tlvdump_SOURCES      = tlvdump.cpp
 
 ndncatchunks_SOURCES = ndncatchunks.cpp
-ndncatchunks_LDADD = ../libndn-cpp.la @BOOST_SYSTEM_LIB@
 
 ndnputchunks_SOURCES = ndnputchunks.cpp
-ndnputchunks_LDADD = ../libndn-cpp.la @BOOST_SYSTEM_LIB@
+
diff --git a/tools/ndncatchunks.cpp b/tools/ndncatchunks.cpp
index c48fdef..7da6060 100644
--- a/tools/ndncatchunks.cpp
+++ b/tools/ndncatchunks.cpp
@@ -19,7 +19,7 @@
  */
 
 
-#include <ndn-cpp/face.hpp>
+#include <ndn-cpp-dev/face.hpp>
 #include <stdexcept>
 #include <iostream>
 
diff --git a/tools/ndnputchunks.cpp b/tools/ndnputchunks.cpp
index a1d581b..e19afe9 100644
--- a/tools/ndnputchunks.cpp
+++ b/tools/ndnputchunks.cpp
@@ -18,8 +18,8 @@
  * Author: Wentao Shang <wentao@cs.ucla.edu>
  */
 
-#include <ndn-cpp/face.hpp>
-#include <ndn-cpp/security/key-chain.hpp>
+#include <ndn-cpp-dev/face.hpp>
+#include <ndn-cpp-dev/security/key-chain.hpp>
 
 #if NDN_CPP_HAVE_CXX11
 // In the std library, the placeholders are in a different namespace than boost.
diff --git a/tools/tlvdump.cpp b/tools/tlvdump.cpp
index 0c5f4bb..be80899 100644
--- a/tools/tlvdump.cpp
+++ b/tools/tlvdump.cpp
@@ -5,8 +5,8 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include <ndn-cpp/face.hpp>
-#include <ndn-cpp/encoding/block.hpp>
+#include <ndn-cpp-dev/face.hpp>
+#include <ndn-cpp-dev/encoding/block.hpp>
 
 #include <iomanip>
 #include <fstream>