diff --git a/include/ndn-cpp/security/certificate/certificate.hpp b/include/ndn-cpp/security/certificate/certificate.hpp
index 270bfb0..21745e2 100644
--- a/include/ndn-cpp/security/certificate/certificate.hpp
+++ b/include/ndn-cpp/security/certificate/certificate.hpp
@@ -32,17 +32,13 @@
    * Create a Certificate from the content in the data packet.
    * @param data The data packet with the content to decode.
    */
-#if 0 // TODO: Define in certificate.cpp
   Certificate(const Data& data);
-#else
-  Certificate(const Data& data) {}
-#endif
  
   /**
    * The virtual destructor.
    */
   virtual 
-  ~Certificate() {}
+  ~Certificate();
 
   /**
    * encode certificate info into content