diff --git a/libndn-cert.pc.in b/libndn-cert.pc.in
index e7a75b6..4dd2e31 100644
--- a/libndn-cert.pc.in
+++ b/libndn-cert.pc.in
@@ -5,5 +5,5 @@
 Name: libndn-cert
 Description: ndncert library
 Version: @VERSION@
-Libs: -L${libdir} -lndn-cert
-Cflags: -I${includedir}
+Libs: -L${libdir} -lndn-cert -lndn-cxx @EXTRA_LINKFLAGS@ @EXTRA_LDFLAGS@ @EXTRA_LIBS@ @EXTRA_FRAMEWORKS@
+Cflags: -I${includedir} @EXTRA_CXXFLAGS@ @EXTRA_INCLUDES@
diff --git a/src/detail/ca-memory.cpp b/src/detail/ca-memory.cpp
index b054cc0..e6ba9c0 100644
--- a/src/detail/ca-memory.cpp
+++ b/src/detail/ca-memory.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "ca-memory.hpp"
+#include "detail/ca-memory.hpp"
 #include <ndn-cxx/security/validation-policy.hpp>
 
 namespace ndn {
diff --git a/src/detail/ca-memory.hpp b/src/detail/ca-memory.hpp
index 0c2fa34..63a3274 100644
--- a/src/detail/ca-memory.hpp
+++ b/src/detail/ca-memory.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_CA_DETAIL_CA_MEMORY_HPP
 #define NDNCERT_CA_DETAIL_CA_MEMORY_HPP
 
-#include "ca-storage.hpp"
+#include "detail/ca-storage.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/detail/ca-sqlite.cpp b/src/detail/ca-sqlite.cpp
index 8371cf4..4f0971d 100644
--- a/src/detail/ca-sqlite.cpp
+++ b/src/detail/ca-sqlite.cpp
@@ -18,10 +18,9 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "ca-sqlite.hpp"
+#include "detail/ca-sqlite.hpp"
 
 #include <sqlite3.h>
-
 #include <boost/filesystem.hpp>
 #include <ndn-cxx/security/validation-policy.hpp>
 #include <ndn-cxx/util/sqlite3-statement.hpp>
diff --git a/src/detail/ca-sqlite.hpp b/src/detail/ca-sqlite.hpp
index f0ffe1f..220fb21 100644
--- a/src/detail/ca-sqlite.hpp
+++ b/src/detail/ca-sqlite.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_CA_DETAIL_CA_SQLITE_HPP
 #define NDNCERT_CA_DETAIL_CA_SQLITE_HPP
 
-#include "ca-storage.hpp"
+#include "detail/ca-storage.hpp"
 
 struct sqlite3;
 
diff --git a/src/detail/ca-state.cpp b/src/detail/ca-state.cpp
index 4dad34d..ae0d210 100644
--- a/src/detail/ca-state.cpp
+++ b/src/detail/ca-state.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "ca-state.hpp"
+#include "detail/ca-state.hpp"
 #include <ndn-cxx/util/indented-stream.hpp>
 
 namespace ndn {
diff --git a/src/detail/challenge-encoder.cpp b/src/detail/challenge-encoder.cpp
index 658cbd8..dfe76ad 100644
--- a/src/detail/challenge-encoder.cpp
+++ b/src/detail/challenge-encoder.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "challenge-encoder.hpp"
+#include "detail/challenge-encoder.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/detail/challenge-encoder.hpp b/src/detail/challenge-encoder.hpp
index cce4108..e714095 100644
--- a/src/detail/challenge-encoder.hpp
+++ b/src/detail/challenge-encoder.hpp
@@ -21,8 +21,8 @@
 #ifndef NDNCERT_PROTOCOL_DETAIL_CHALLENGE_STEP_HPP
 #define NDNCERT_PROTOCOL_DETAIL_CHALLENGE_STEP_HPP
 
-#include "../detail/ca-state.hpp"
-#include "../requester-state.hpp"
+#include "detail/ca-state.hpp"
+#include "requester-state.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/detail/crypto-helpers.cpp b/src/detail/crypto-helpers.cpp
index 9decd97..c62db20 100644
--- a/src/detail/crypto-helpers.cpp
+++ b/src/detail/crypto-helpers.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "crypto-helpers.hpp"
+#include "detail/crypto-helpers.hpp"
 
 #include <boost/endian/conversion.hpp>
 #include <ndn-cxx/encoding/buffer-stream.hpp>
diff --git a/src/detail/crypto-helpers.hpp b/src/detail/crypto-helpers.hpp
index 353942a..56446e4 100644
--- a/src/detail/crypto-helpers.hpp
+++ b/src/detail/crypto-helpers.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_DETAIL_CRYPTO_HELPERS_HPP
 #define NDNCERT_DETAIL_CRYPTO_HELPERS_HPP
 
-#include "ndncert-common.hpp"
+#include "detail/ndncert-common.hpp"
 #include <openssl/evp.h>
 
 namespace ndn {
diff --git a/src/detail/error-encoder.cpp b/src/detail/error-encoder.cpp
index 84b7866..72b85c5 100644
--- a/src/detail/error-encoder.cpp
+++ b/src/detail/error-encoder.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "error-encoder.hpp"
+#include "detail/error-encoder.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/detail/error-encoder.hpp b/src/detail/error-encoder.hpp
index 76ecb36..e8cdf82 100644
--- a/src/detail/error-encoder.hpp
+++ b/src/detail/error-encoder.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_PROTOCOL_DETAIL_ERROR_ENCODER_HPP
 #define NDNCERT_PROTOCOL_DETAIL_ERROR_ENCODER_HPP
 
-#include "../configuration.hpp"
+#include "configuration.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/detail/info-encoder.cpp b/src/detail/info-encoder.cpp
index 7939526..8a40bd7 100644
--- a/src/detail/info-encoder.cpp
+++ b/src/detail/info-encoder.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "info-encoder.hpp"
+#include "detail/info-encoder.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/detail/info-encoder.hpp b/src/detail/info-encoder.hpp
index e317d5a..e0cc536 100644
--- a/src/detail/info-encoder.hpp
+++ b/src/detail/info-encoder.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_PROTOCOL_DETAIL_INFO_ENCODER_HPP
 #define NDNCERT_PROTOCOL_DETAIL_INFO_ENCODER_HPP
 
-#include "../configuration.hpp"
+#include "configuration.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/detail/ndncert-common.cpp b/src/detail/ndncert-common.cpp
index c413778..7c210b7 100644
--- a/src/detail/ndncert-common.cpp
+++ b/src/detail/ndncert-common.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "ndncert-common.hpp"
+#include "detail/ndncert-common.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/detail/new-renew-revoke-encoder.cpp b/src/detail/new-renew-revoke-encoder.cpp
index 27c630e..41c0c5f 100644
--- a/src/detail/new-renew-revoke-encoder.cpp
+++ b/src/detail/new-renew-revoke-encoder.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "new-renew-revoke-encoder.hpp"
+#include "detail/new-renew-revoke-encoder.hpp"
 #include <ndn-cxx/security/transform/base64-encode.hpp>
 #include <ndn-cxx/security/transform/buffer-source.hpp>
 #include <ndn-cxx/security/transform/stream-sink.hpp>
diff --git a/src/detail/new-renew-revoke-encoder.hpp b/src/detail/new-renew-revoke-encoder.hpp
index de61e2e..80d5866 100644
--- a/src/detail/new-renew-revoke-encoder.hpp
+++ b/src/detail/new-renew-revoke-encoder.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_PROTOCOL_DETAIL_NEW_RENEW_REVOKE_ENCODER_HPP
 #define NDNCERT_PROTOCOL_DETAIL_NEW_RENEW_REVOKE_ENCODER_HPP
 
-#include "../detail/ca-state.hpp"
+#include "detail/ca-state.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/detail/probe-encoder.cpp b/src/detail/probe-encoder.cpp
index ce3c3fe..2908922 100644
--- a/src/detail/probe-encoder.cpp
+++ b/src/detail/probe-encoder.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "probe-encoder.hpp"
+#include "detail/probe-encoder.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/detail/probe-encoder.hpp b/src/detail/probe-encoder.hpp
index c0e038e..df8dfec 100644
--- a/src/detail/probe-encoder.hpp
+++ b/src/detail/probe-encoder.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_PROTOCOL_DETAIL_PROBE_ENCODER_HPP
 #define NDNCERT_PROTOCOL_DETAIL_PROBE_ENCODER_HPP
 
-#include "../configuration.hpp"
+#include "configuration.hpp"
 
 namespace ndn {
 namespace ndncert {