diff --git a/src/ca-module.cpp b/src/ca-module.cpp
index f332183..0c40040 100644
--- a/src/ca-module.cpp
+++ b/src/ca-module.cpp
@@ -323,7 +323,7 @@
   result.setFreshnessPeriod(DEFAULT_DATA_FRESHNESS_PERIOD);
   result.setContent(NewRenewRevokeEncoder::encodeDataContent(myEcdhPubKeyBase64,
                                                              salt,
-                                                             requestState,
+                                                             requestState.m_requestId, requestState.m_status,
                                                              m_config.m_caItem.m_supportedChallenges));
   m_keyChain.sign(result, signingByIdentity(m_config.m_caItem.m_caPrefix));
   m_face.put(result);
diff --git a/src/detail/new-renew-revoke-encoder.cpp b/src/detail/new-renew-revoke-encoder.cpp
index 41c0c5f..043bb83 100644
--- a/src/detail/new-renew-revoke-encoder.cpp
+++ b/src/detail/new-renew-revoke-encoder.cpp
@@ -80,14 +80,14 @@
 
 Block
 NewRenewRevokeEncoder::encodeDataContent(const std::vector<uint8_t>& ecdhKey, const std::array<uint8_t, 32>& salt,
-                                         const CaState& request,
+                                         const RequestID& requestId, const Status& status,
                                          const std::list<std::string>& challenges)
 {
   Block response = makeEmptyBlock(ndn::tlv::Content);
   response.push_back(makeBinaryBlock(tlv::EcdhPub, ecdhKey.data(), ecdhKey.size()));
   response.push_back(makeBinaryBlock(tlv::Salt, salt.data(), salt.size()));
-  response.push_back(makeBinaryBlock(tlv::RequestId, request.m_requestId.data(), request.m_requestId.size()));
-  response.push_back(makeNonNegativeIntegerBlock(tlv::Status, static_cast<size_t>(request.m_status)));
+  response.push_back(makeBinaryBlock(tlv::RequestId, requestId.data(), requestId.size()));
+  response.push_back(makeNonNegativeIntegerBlock(tlv::Status, static_cast<size_t>(status)));
   for (const auto& entry: challenges) {
     response.push_back(makeStringBlock(tlv::Challenge, entry));
   }
diff --git a/src/detail/new-renew-revoke-encoder.hpp b/src/detail/new-renew-revoke-encoder.hpp
index ce90c6f..a6d3d4a 100644
--- a/src/detail/new-renew-revoke-encoder.hpp
+++ b/src/detail/new-renew-revoke-encoder.hpp
@@ -38,9 +38,8 @@
                               shared_ptr<security::Certificate>& certRequest);
 
   static Block
-  encodeDataContent(const std::vector<uint8_t>& ecdhKey,
-                    const std::array<uint8_t, 32>& salt,
-                    const CaState& request,
+  encodeDataContent(const std::vector<uint8_t>& ecdhKey, const std::array<uint8_t, 32>& salt,
+                    const RequestID& requestId, const Status& status,
                     const std::list<std::string>& challenges);
 
   static std::list<std::string>
diff --git a/src/detail/probe-encoder.hpp b/src/detail/probe-encoder.hpp
index f75e892..2e47e76 100644
--- a/src/detail/probe-encoder.hpp
+++ b/src/detail/probe-encoder.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_DETAIL_PROBE_ENCODER_HPP
 #define NDNCERT_DETAIL_PROBE_ENCODER_HPP
 
-#include "configuration.hpp"
+#include "detail/ndncert-common.hpp"
 
 namespace ndn {
 namespace ndncert {