diff --git a/src/common.hpp b/src/common.hpp
index ecd0719..6b7c7b9 100644
--- a/src/common.hpp
+++ b/src/common.hpp
@@ -33,19 +33,15 @@
 #include <ndn-cxx/util/scheduler.hpp>
 
 #include <boost/utility.hpp>
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/random/uniform_int_distribution.hpp>
-#include <boost/random/geometric_distribution.hpp>
 
+#include <algorithm>
+#include <functional>
+#include <iostream>
+#include <list>
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
-#include <queue>
-#include <list>
-#include <algorithm>
-#include <iostream>
-#include <functional>
-#include <memory>
 
 namespace repo {
 
diff --git a/src/handles/base-handle.cpp b/src/handles/base-handle.cpp
index 76fa36c..8555f39 100644
--- a/src/handles/base-handle.cpp
+++ b/src/handles/base-handle.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014,  Regents of the University of California.
+/*
+ * Copyright (c) 2014-2017, Regents of the University of California.
  *
  * This file is part of NDN repo-ng (Next generation of NDN repository).
  * See AUTHORS.md for complete list of repo-ng authors and contributors.
@@ -19,14 +19,14 @@
 
 #include "base-handle.hpp"
 
+#include <ndn-cxx/util/random.hpp>
+
 namespace repo {
 
 uint64_t
 BaseHandle::generateProcessId()
 {
-  static boost::random::mt19937_64 gen;
-  static boost::random::uniform_int_distribution<uint64_t> dist(0, 0xFFFFFFFFFFFFFFFFLL);
-  return dist(gen);
+  return ndn::random::generateWord64();
 }
 
-}
+} // namespace repo