diff --git a/ndn-cpp/c/common.h b/ndn-cpp/c/common.h
index 3f27199..72af018 100644
--- a/ndn-cpp/c/common.h
+++ b/ndn-cpp/c/common.h
@@ -7,7 +7,7 @@
 #ifndef NDN_COMMON_H
 #define	NDN_COMMON_H
 
-#include "../../config.h"
+#include "../ndn-cpp-config.h"
 #include <stdint.h>
 #include <stddef.h>
 
diff --git a/ndn-cpp/c/util/ndn_memory.h b/ndn-cpp/c/util/ndn_memory.h
index 68721e8..abf3bcf 100644
--- a/ndn-cpp/c/util/ndn_memory.h
+++ b/ndn-cpp/c/util/ndn_memory.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Based on HAVE_MEMCPY and HAVE_MEMSET in config.h, use the library version or a local implementation of memcmp, memcpy and memset.
+ * Based on HAVE_MEMCPY and HAVE_MEMSET in ndn-cpp-config.h, use the library version or a local implementation of memcmp, memcpy and memset.
  */
 
 #ifndef NDN_MEMORY_H
diff --git a/ndn-cpp/common.hpp b/ndn-cpp/common.hpp
index 70b36ed..74f0214 100644
--- a/ndn-cpp/common.hpp
+++ b/ndn-cpp/common.hpp
@@ -8,7 +8,7 @@
 #define NDN_COMMON_HPP
 
 #include <vector>
-// common.h includes config.h.
+// common.h includes ndn-cpp-config.h.
 #include "c/common.h"
 
 // Depending on where ./configure found shared_ptr, define the ptr_lib namespace.
diff --git a/ndn-cpp/security/identity/basic-identity-storage.cpp b/ndn-cpp/security/identity/basic-identity-storage.cpp
index dbdfda2..135bbe8 100644
--- a/ndn-cpp/security/identity/basic-identity-storage.cpp
+++ b/ndn-cpp/security/identity/basic-identity-storage.cpp
@@ -5,7 +5,7 @@
  * See COPYING for copyright and distribution information.
  */
 
-// Only compile if config.h defines HAVE_SQLITE3.
+// Only compile if ndn-cpp-config.h defines HAVE_SQLITE3.
 #include "../../c/common.h"
 #if 0 // temporarily disable.
 //#ifdef HAVE_SQLITE3
diff --git a/ndn-cpp/security/identity/basic-identity-storage.hpp b/ndn-cpp/security/identity/basic-identity-storage.hpp
index 1df05fe..7e8862b 100644
--- a/ndn-cpp/security/identity/basic-identity-storage.hpp
+++ b/ndn-cpp/security/identity/basic-identity-storage.hpp
@@ -8,7 +8,7 @@
 #ifndef NDN_BASIC_IDENTITY_STORAGE_H
 #define NDN_BASIC_IDENTITY_STORAGE_H
 
-// Only compile if config.h defines HAVE_SQLITE3.
+// Only compile if ndn-cpp-config.h defines HAVE_SQLITE3.
 #include "../../c/common.h"
 #if 0 // temporarily disable.
 //#ifdef HAVE_SQLITE3
diff --git a/ndn-cpp/security/identity/osx-private-key-storage.cpp b/ndn-cpp/security/identity/osx-private-key-storage.cpp
index 2840e64..3efc99b 100644
--- a/ndn-cpp/security/identity/osx-private-key-storage.cpp
+++ b/ndn-cpp/security/identity/osx-private-key-storage.cpp
@@ -5,7 +5,7 @@
  * See COPYING for copyright and distribution information.
  */
 
-// Only compile if config.h defines HAVE_OSX_SECKEYCHAIN 1.
+// Only compile if ndn-cpp-config.h defines HAVE_OSX_SECKEYCHAIN 1.
 #include "../../c/common.h"
 #if 0 // temporarily disable.
 //#if 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 a7febc2..edb15db 100644
--- a/ndn-cpp/security/identity/osx-private-key-storage.hpp
+++ b/ndn-cpp/security/identity/osx-private-key-storage.hpp
@@ -8,7 +8,7 @@
 #ifndef NDN_OSX_PRIVATEKEY_STORAGE_H
 #define NDN_OSX_PRIVATEKEY_STORAGE_H
 
-// Only compile if config.h defines HAVE_OSX_SECKEYCHAIN 1.
+// Only compile if ndn-cpp-config.h defines HAVE_OSX_SECKEYCHAIN 1.
 #include "../../c/common.h"
 #if 0 // temporarily disable.
 //#if HAVE_OSX_SECKEYCHAIN