src: Another round of source updates: moving all headers close to implementation files

Change-Id: I3d47076504950e67746174623c75383948e9d93d
diff --git a/src/util/crypto.cpp b/src/util/crypto.cpp
index ce17259..490feb8 100644
--- a/src/util/crypto.cpp
+++ b/src/util/crypto.cpp
@@ -4,7 +4,7 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include "ndn-cpp-dev/util/crypto.hpp"
+#include "util/crypto.hpp"
 
 namespace ndn {
 
diff --git a/src/util/crypto.hpp b/src/util/crypto.hpp
new file mode 100644
index 0000000..5fb5d35
--- /dev/null
+++ b/src/util/crypto.hpp
@@ -0,0 +1,27 @@
+/**
+ * Copyright (C) 2013 Regents of the University of California.
+ * @author: Jeff Thompson <jefft0@remap.ucla.edu>
+ * See COPYING for copyright and distribution information.
+ */
+
+#ifndef NDN_UTIL_CRYPTO_HPP
+#define NDN_UTIL_CRYPTO_HPP
+
+#include "common.hpp"
+
+#include <openssl/ssl.h>
+#include <openssl/rsa.h>
+
+namespace ndn {
+
+/**
+ * Compute the sha-256 digest of data.
+ * @param data Pointer to the input byte array.
+ * @param dataLength The length of data.
+ * @param digest A pointer to a buffer of size SHA256_DIGEST_LENGTH to receive the data.
+ */
+void ndn_digestSha256(const uint8_t *data, size_t dataLength, uint8_t *digest);
+
+} // namespace ndn
+
+#endif // NDN_UTIL_CRYPTO_HPP
diff --git a/src/util/logging.hpp b/src/util/logging.hpp
index e9bf4d5..3f5848e 100644
--- a/src/util/logging.hpp
+++ b/src/util/logging.hpp
@@ -9,7 +9,7 @@
 #ifndef NDN_LOGGING_HPP
 #define NDN_LOGGING_HPP
 
-#include <ndn-cpp-dev/common.hpp>
+#include "common.hpp"
 
 #ifdef NDN_CPP_HAVE_LOG4CXX
 
diff --git a/src/util/ndnd-id-fetcher.hpp b/src/util/ndnd-id-fetcher.hpp
index e10eb38..a44dbbc 100644
--- a/src/util/ndnd-id-fetcher.hpp
+++ b/src/util/ndnd-id-fetcher.hpp
@@ -8,8 +8,8 @@
 #ifndef NDN_NDND_ID_FETCHER_HPP
 #define NDN_NDND_ID_FETCHER_HPP
 
-#include <ndn-cpp-dev/common.hpp>
-#include "ndn-cpp-dev/util/crypto.hpp"
+#include "common.hpp"
+#include "util/crypto.hpp"
 
 namespace ndn {
 
diff --git a/src/util/time.hpp b/src/util/time.hpp
index 7b42b4a..8f110a9 100644
--- a/src/util/time.hpp
+++ b/src/util/time.hpp
@@ -8,7 +8,7 @@
 #ifndef NDN_TIME_HPP
 #define NDN_TIME_HPP
 
-#include "ndn-cpp-dev/common.hpp"
+#include "common.hpp"
 #include <boost/date_time/posix_time/posix_time.hpp>
 
 namespace ndn {