diff --git a/include/tr/interface/serializable.h b/include/tr/interface/serializable.h
index 3d6964b..533d7fd 100644
--- a/include/tr/interface/serializable.h
+++ b/include/tr/interface/serializable.h
@@ -24,27 +24,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SERIALIZABLE_H__
-#define __SERIALIZABLE_H__
+#ifndef __TR_SERIALIZABLE_H__
+#define __TR_SERIALIZABLE_H__
 
 #include "tr/interface.h"
 
 
-typedef size_t (* fptr_serializeSize)(void *);
-typedef void   (* fptr_serialize)(void *, unsigned char *);
+//typedef size_t (* fptr_serializeSize)(void *);
+typedef void   (* fptr_serialize)(void *, unsigned char **, size_t *);
 typedef void   (* fptr_unserialize)(void *, const unsigned char *, size_t);
 
 TR_INTERFACE(TR_Serializable) {
 	TR_IFID;
-	fptr_serializeSize serializeSize;
+//	fptr_serializeSize serializeSize;
 	fptr_serialize     serialize;
 	fptr_unserialize   unserialize;
 };
 
-size_t TR_serializeSize(void *);
-void   TR_serialize(void *, unsigned char *);
+//size_t TR_serializeSize(void *);
+void   TR_serialize(void *, unsigned char **, size_t *);
 void   TR_unserialize(void *, const unsigned char *, size_t);
 
-#endif // __SERIALIZABLE_H__
+#endif // __TR_SERIALIZABLE_H__
 
 // vim: set ts=4 sw=4:
diff --git a/src/Makefile.am b/src/Makefile.am
index e85d77d..bf2823d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,8 +8,8 @@ TR_CLASS = memory.c \
 	   i_class.c \
 	   i_subject.c \
 	   i_observer.c \
-	   i_indexable \
-	   i_serializable
+	   i_indexable.c \
+	   i_serializable.c
 
 lib_LTLIBRARIES = libtrbase.la
 
diff --git a/src/i_indexable.c b/src/i_indexable.c
index 3032254..a2eb4ee 100644
--- a/src/i_indexable.c
+++ b/src/i_indexable.c
@@ -37,7 +37,7 @@ TR_getIndex(void * indexable)
 {
 	void * ret;
 
-	TR_RETCALL(indexable, TR_Indexable, uuid, ret, namespace);
+	TR_RETCALL(indexable, TR_Indexable, index, ret);
 
 	return ret;
 }