diff --git a/Makefile.am b/Makefile.am
index fb62ca2..0761bfe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,23 +15,13 @@
 
 ndn_cpp_a_SOURCES = ndn-cpp/common.h ndn-cpp/config.h \
   ndn-cpp/Name.cpp ndn-cpp/Name.h ndn-cpp/Name.hpp \
-  ndn-cpp/data.cc ndn-cpp/data.h \
-  ndn-cpp/interest.cc ndn-cpp/interest.h \
-  ndn-cpp/fields/blob.h \
-  ndn-cpp/fields/content.cc ndn-cpp/fields/content.h \
-  ndn-cpp/fields/exclude.cc ndn-cpp/fields/exclude.h \
-  ndn-cpp/fields/key-locator.cc ndn-cpp/fields/key-locator.h \
-  ndn-cpp/fields/name-component.cc ndn-cpp/fields/name-component.h \
-  ndn-cpp/fields/name.cc ndn-cpp/fields/name.h \
-  ndn-cpp/fields/signature.cc ndn-cpp/fields/signature.h \
   ndn-cpp/encoding/BinaryXML.h \
   ndn-cpp/encoding/BinaryXMLDecoder.c ndn-cpp/encoding/BinaryXMLDecoder.h \
+  ndn-cpp/encoding/BinaryXMLName.c ndn-cpp/encoding/BinaryXMLName.h \
   ndn-cpp/encoding/BinaryXMLStructureDecoder.c ndn-cpp/encoding/BinaryXMLStructureDecoder.h \
   ndn-cpp/encoding/BinaryXMLStructureDecoder.hpp \
   ndn-cpp/encoding/BinaryXMLWireFormat.cpp ndn-cpp/encoding/BinaryXMLWireFormat.hpp \
   ndn-cpp/encoding/WireFormat.cpp ndn-cpp/encoding/WireFormat.hpp \
-  ndn-cpp/encoding/base.h \
-  ndn-cpp/encoding/ccnb.cc ndn-cpp/encoding/ccnb.h \
   ndn-cpp/util/ndn_memory.c ndn-cpp/util/ndn_memory.h
 
 test_encode_decode_interest_SOURCES = test/test-encode-decode-interest.cpp