diff --git a/src/util/crypto.cpp b/src/util/crypto.cpp
index 3aa114a..1621005 100644
--- a/src/util/crypto.cpp
+++ b/src/util/crypto.cpp
@@ -6,9 +6,7 @@
 #include "../common.hpp"
 
 #include "crypto.hpp"
-#include <cryptopp/sha.h>
-#include <cryptopp/filters.h>
-#include <cryptopp/files.h>
+#include "../security/cryptopp.hpp"
 
 namespace ndn {
 
diff --git a/src/util/io.hpp b/src/util/io.hpp
index 3d39feb..6026f06 100644
--- a/src/util/io.hpp
+++ b/src/util/io.hpp
@@ -13,9 +13,7 @@
 #include <string>
 #include <iostream>
 #include <fstream>
-#include <cryptopp/files.h>
-#include <cryptopp/base64.h>
-#include <cryptopp/hex.h>
+#include "../security/cryptopp.hpp"
 
 
 namespace ndn {
diff --git a/src/util/random.cpp b/src/util/random.cpp
index c63e916..db26a3e 100644
--- a/src/util/random.cpp
+++ b/src/util/random.cpp
@@ -8,7 +8,7 @@
 
 #include "random.hpp"
 
-#include <cryptopp/osrng.h>
+#include "../security/cryptopp.hpp"
 
 namespace ndn {
 namespace random {
diff --git a/src/util/regex/regex-component-set-matcher.hpp b/src/util/regex/regex-component-set-matcher.hpp
index 857c59e..4039388 100644
--- a/src/util/regex/regex-component-set-matcher.hpp
+++ b/src/util/regex/regex-component-set-matcher.hpp
@@ -78,8 +78,6 @@
 inline void 
 RegexComponentSetMatcher::compile()
 {
-  int index = 0;
-
   switch(m_expr[0]){
   case '<':
     return compileSingleComponent();