-};
-
-void reader_resetbits(struct reader_t*r);
-unsigned int reader_readbit(struct reader_t*r);
-unsigned int reader_readbits(struct reader_t*r, int num);
-
-void writer_resetbits(struct writer_t*w);
-void writer_writebit(struct writer_t*w, int bit);
-void writer_writebits(struct writer_t*w, unsigned int data, int bits);
+} writer_t;
+
+void reader_resetbits(reader_t*r);
+unsigned int reader_readbit(reader_t*r);
+unsigned int reader_readbits(reader_t*r, int num);
+
+U8 reader_readU8(reader_t*r);
+U16 reader_readU16(reader_t*r);
+U32 reader_readU32(reader_t*r);
+float reader_readFloat(reader_t*r);
+double reader_readDouble(reader_t*r);
+char*reader_readString(reader_t*r);
+
+void writer_resetbits(writer_t*w);
+void writer_writebit(writer_t*w, int bit);
+void writer_writebits(writer_t*w, unsigned int data, int bits);
+
+void writer_writeU8(writer_t*w, unsigned char b);
+void writer_writeU16(writer_t*w, unsigned short v);
+void writer_writeU32(writer_t*w, unsigned long v);
+void writer_writeFloat(writer_t*w, float f);
+void writer_writeDouble(writer_t*w, double f);
+void writer_writeString(writer_t*w, const char*s);