diff --git a/ndn-cpp/common.h b/ndn-cpp/common.h
deleted file mode 100644
index 2b75bc8..0000000
--- a/ndn-cpp/common.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
-/*
- * Copyright (c) 2013, Regents of the University of California
- *                     Alexander Afanasyev
- *                     Zhenkai Zhu
- *
- * BSD license, See the LICENSE file for more information
- *
- * Author: Zhenkai Zhu <zhenkai@cs.ucla.edu>
- *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
- */
-
-#ifndef NDN_COMMON_H
-#define NDN_COMMON_H
-
-#include <boost/date_time/posix_time/posix_time_types.hpp>
-#include "../config.h"
-
-// Depending on where ./configure found shared_ptr, define the ptr_lib namespace.
-// We always use ndn::ptr_lib::shared_ptr.
-#if HAVE_STD_SHARED_PTR
-#include <memory>
-namespace ndn { namespace ptr_lib = std; }
-#elif HAVE_BOOST_SHARED_PTR
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
-namespace ndn { namespace ptr_lib = boost; }
-#else
-#error "Can't find shared_ptr in std or boost"
-#endif
-
-namespace ndn
-{
-typedef boost::posix_time::ptime Time;
-typedef boost::posix_time::time_duration TimeInterval;
-
-namespace time
-{
-inline TimeInterval Seconds (int secs) { return boost::posix_time::seconds (secs); }
-inline TimeInterval Milliseconds (int msecs) { return boost::posix_time::milliseconds (msecs); }
-inline TimeInterval Microseconds (int musecs) { return boost::posix_time::microseconds (musecs); }
-
-inline TimeInterval Seconds (double fractionalSeconds)
-{
-  double seconds, microseconds;
-  seconds = std::modf (fractionalSeconds, &microseconds);
-  microseconds *= 1000000;
-
-  return time::Seconds((int)seconds) + time::Microseconds((int)microseconds);
-}
-
-inline Time Now () { return boost::posix_time::microsec_clock::universal_time (); }
-
-const Time UNIX_EPOCH_TIME = Time (boost::gregorian::date (1970, boost::gregorian::Jan, 1));
-inline TimeInterval NowUnixTimestamp ()
-{
-  return TimeInterval (time::Now () - UNIX_EPOCH_TIME);
-}
-} // time
-} // ndn
-
-#include <vector>
-#include <boost/exception/all.hpp>
-#include <boost/function.hpp>
-#include <string>
-#include <sstream>
-#include <map>
-#include <utility>
-#include <string.h>
-#include <boost/iostreams/filter/gzip.hpp>
-#include <boost/iostreams/filtering_stream.hpp>
-#include <boost/iostreams/device/back_inserter.hpp>
-#include <boost/range/iterator_range.hpp>
-
-namespace ndn {
-typedef std::vector<unsigned char> Bytes;
-typedef std::vector<std::string>Comps;
-
-inline
-const unsigned char *
-head(const Bytes &bytes)
-{
-  return &bytes[0];
-}
-
-inline
-unsigned char *
-head (Bytes &bytes)
-{
-  return &bytes[0];
-}
-
-// --- Bytes operations start ---
-inline void
-readRaw(Bytes &bytes, const unsigned char *src, size_t len)
-{
-  if (len > 0)
-  {
-    bytes.resize(len);
-    memcpy (head (bytes), src, len);
-  }
-}
-
-inline ptr_lib::shared_ptr<Bytes>
-readRawPtr (const unsigned char *src, size_t len)
-{
-  if (len > 0)
-    {
-      ptr_lib::shared_ptr<Bytes> ret (new Bytes (len));
-      memcpy (head (*ret), src, len);
-
-      return ret;
-    }
-  else
-    return ptr_lib::shared_ptr<Bytes> ();
-}
-} // ndn
-#endif // NDN_COMMON_H
diff --git a/ndn-cpp/common.hpp b/ndn-cpp/common.hpp
new file mode 100644
index 0000000..39a73af
--- /dev/null
+++ b/ndn-cpp/common.hpp
@@ -0,0 +1,31 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2013, Regents of the University of California
+ *                     Alexander Afanasyev
+ *                     Zhenkai Zhu
+ *
+ * BSD license, See the LICENSE file for more information
+ *
+ * Author: Zhenkai Zhu <zhenkai@cs.ucla.edu>
+ *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ */
+
+#ifndef NDN_COMMON_HPP
+#define NDN_COMMON_HPP
+
+#include "../config.h"
+
+// Depending on where ./configure found shared_ptr, define the ptr_lib namespace.
+// We always use ndn::ptr_lib::shared_ptr.
+#if HAVE_STD_SHARED_PTR
+#include <memory>
+namespace ndn { namespace ptr_lib = std; }
+#elif HAVE_BOOST_SHARED_PTR
+#include <boost/shared_ptr.hpp>
+#include <boost/make_shared.hpp>
+namespace ndn { namespace ptr_lib = boost; }
+#else
+#error "Can't find shared_ptr in std or boost"
+#endif
+
+#endif