diff --git a/ndn-handle/ndn-handle-common.hpp b/ndn-handle/ndn-handle-common.hpp
index c761805..73634b3 100644
--- a/ndn-handle/ndn-handle-common.hpp
+++ b/ndn-handle/ndn-handle-common.hpp
@@ -20,13 +20,12 @@
 #include <ndn-cpp-dev/face.hpp>
 #include <ndn-cpp-dev/security/key-chain.hpp>
 #include <ndn-cpp-dev/util/command-interest-validator.hpp>
+#include <ndn-cpp-dev/util/time.hpp>
+#include <ndn-cpp-dev/util/scheduler.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/random/uniform_int_distribution.hpp>
 #include <map>
-
-#define RETRY_TIMEOUT 3
-#define DEFAULT_CREDIT 12
-#define NOEND_TIMEOUT 10000
+#include <algorithm>
 
 namespace repo {
 
@@ -37,9 +36,13 @@
 using ndn::Selectors;
 using ndn::bind;
 using ndn::CommandInterestValidator;
+using ndn::Scheduler;
 
 using boost::shared_ptr;
 
+typedef uint64_t ProcessId;
+typedef uint64_t SegmentNo;
+
 }
 
 #endif // REPO_NDN_HANDLE_NDN_HANDLE_COMMON_HPP