diff --git a/ndn-cpp/Name.h b/ndn-cpp/Name.h
new file mode 100644
index 0000000..1f10b77
--- /dev/null
+++ b/ndn-cpp/Name.h
@@ -0,0 +1,35 @@
+/* 
+ * Author: Jeff Thompson
+ *
+ * BSD license, See the LICENSE file for more information.
+ */
+
+#ifndef NDN_NAME_H
+#define	NDN_NAME_H
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+  
+struct ndn_Component {
+  unsigned char *value;
+  unsigned int valueLen;
+};
+
+enum {
+  ndn_Name_MAX_COMPONENTS = 100  
+};
+  
+struct ndn_Name {
+  struct ndn_Component components[ndn_Name_MAX_COMPONENTS];
+  unsigned int nComponents;
+};
+
+void ndn_Name_init(struct ndn_Name *self);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* NAME_H */
+
diff --git a/ndn-cpp/encoding/BinaryXMLDecoder.h b/ndn-cpp/encoding/BinaryXMLDecoder.h
index 0dba632..cc5cacd 100644
--- a/ndn-cpp/encoding/BinaryXMLDecoder.h
+++ b/ndn-cpp/encoding/BinaryXMLDecoder.h
@@ -17,7 +17,7 @@
   unsigned int offset;
 };
 
-static void ndn_BinaryXMLDecoder_init(struct ndn_BinaryXMLDecoder *self, const unsigned char *input, unsigned int inputLength) {
+static inline void ndn_BinaryXMLDecoder_init(struct ndn_BinaryXMLDecoder *self, const unsigned char *input, unsigned int inputLength) {
   self->input = input;
   self->inputLength = inputLength;
   self->offset = 0;