diff --git a/include/ndn-cpp/data.hpp b/include/ndn-cpp/data.hpp
index e2d9451..6f0f397 100644
--- a/include/ndn-cpp/data.hpp
+++ b/include/ndn-cpp/data.hpp
@@ -15,6 +15,7 @@
 #include "signature.hpp"
 #include "meta-info.hpp"
 #include "key-locator.hpp"
+#include "security/signature/signature-sha256-with-rsa.hpp"
 
 namespace ndn {
   
diff --git a/src/name.cpp b/src/name.cpp
index b71c23c..35380c3 100644
--- a/src/name.cpp
+++ b/src/name.cpp
@@ -360,6 +360,9 @@
   wire_ = wire;
   wire_.parse();
 
+  components_.clear();
+  components_.reserve(wire_.getAll().size());
+
   for (Block::element_const_iterator i = wire_.getAll().begin();
        i != wire_.getAll().end();
        ++i)