diff --git a/ndn-cpp/security/identity/basic-identity-storage.cpp b/ndn-cpp/security/identity/basic-identity-storage.cpp
index 135bbe8..5215e5f 100644
--- a/ndn-cpp/security/identity/basic-identity-storage.cpp
+++ b/ndn-cpp/security/identity/basic-identity-storage.cpp
@@ -5,10 +5,10 @@
  * See COPYING for copyright and distribution information.
  */
 
-// Only compile if ndn-cpp-config.h defines HAVE_SQLITE3.
-#include "../../c/common.h"
+// Only compile if ndn-cpp-config.h defines NDN_CPP_HAVE_SQLITE3.
+#include "../../ndn-cpp-config.h"
 #if 0 // temporarily disable.
-//#ifdef HAVE_SQLITE3
+//#ifdef NDN_CPP_HAVE_SQLITE3
 
 #include <stdlib.h>
 #include <sstream>
@@ -674,4 +674,4 @@
         
 }
 
-#endif // HAVE_SQLITE3
+#endif // NDN_CPP_HAVE_SQLITE3
diff --git a/ndn-cpp/security/identity/basic-identity-storage.hpp b/ndn-cpp/security/identity/basic-identity-storage.hpp
index 7e8862b..5c61112 100644
--- a/ndn-cpp/security/identity/basic-identity-storage.hpp
+++ b/ndn-cpp/security/identity/basic-identity-storage.hpp
@@ -8,10 +8,10 @@
 #ifndef NDN_BASIC_IDENTITY_STORAGE_H
 #define NDN_BASIC_IDENTITY_STORAGE_H
 
-// Only compile if ndn-cpp-config.h defines HAVE_SQLITE3.
-#include "../../c/common.h"
+// Only compile if ndn-cpp-config.h defines NDN_CPP_HAVE_SQLITE3.
+#include "../../ndn-cpp-config.h"
 #if 0 // temporarily disable.
-//#ifdef HAVE_SQLITE3
+//#ifdef NDN_CPP_HAVE_SQLITE3
 
 #include <sqlite3.h>
 #include "../../common.hpp"
@@ -207,6 +207,6 @@
 
 }
 
-#endif // HAVE_SQLITE3
+#endif // NDN_CPP_HAVE_SQLITE3
 
 #endif
diff --git a/ndn-cpp/security/identity/osx-private-key-storage.cpp b/ndn-cpp/security/identity/osx-private-key-storage.cpp
index 3efc99b..d1ea2c5 100644
--- a/ndn-cpp/security/identity/osx-private-key-storage.cpp
+++ b/ndn-cpp/security/identity/osx-private-key-storage.cpp
@@ -5,11 +5,10 @@
  * See COPYING for copyright and distribution information.
  */
 
-// Only compile if ndn-cpp-config.h defines HAVE_OSX_SECKEYCHAIN 1.
-#include "../../c/common.h"
+// Only compile if ndn-cpp-config.h defines NDN_CPP_HAVE_OSX_SECKEYCHAIN 1.
+#include "../../ndn-cpp-config.h"
 #if 0 // temporarily disable.
-//#if HAVE_OSX_SECKEYCHAIN
-
+//#if NDN_CPP_HAVE_OSX_SECKEYCHAIN
 
 #include <fstream>
 #include <sstream>
@@ -514,4 +513,4 @@
   
 }
 
-#endif HAVE_OSX_SECKEYCHAIN
+#endif NDN_CPP_HAVE_OSX_SECKEYCHAIN
diff --git a/ndn-cpp/security/identity/osx-private-key-storage.hpp b/ndn-cpp/security/identity/osx-private-key-storage.hpp
index edb15db..514d660 100644
--- a/ndn-cpp/security/identity/osx-private-key-storage.hpp
+++ b/ndn-cpp/security/identity/osx-private-key-storage.hpp
@@ -8,10 +8,10 @@
 #ifndef NDN_OSX_PRIVATEKEY_STORAGE_H
 #define NDN_OSX_PRIVATEKEY_STORAGE_H
 
-// Only compile if ndn-cpp-config.h defines HAVE_OSX_SECKEYCHAIN 1.
-#include "../../c/common.h"
+// Only compile if ndn-cpp-config.h defines NDN_CPP_HAVE_OSX_SECKEYCHAIN 1.
+#include "../../ndn-cpp-config.h"
 #if 0 // temporarily disable.
-//#if HAVE_OSX_SECKEYCHAIN
+//#if NDN_CPP_HAVE_OSX_SECKEYCHAIN
 
 #include "../../common.hpp"
 #include "private-key-storage.hpp"
@@ -201,6 +201,6 @@
   
 }
 
-#endif HAVE_OSX_SECKEYCHAIN
+#endif NDN_CPP_HAVE_OSX_SECKEYCHAIN
 
 #endif