6 files changed, 15 insertions, 15 deletions
diff --git a/lib/io/test/get_line.c b/lib/io/test/get_line.c
index 0ce67ac..d300a3a 100644
--- a/lib/io/test/get_line.c
+++ b/lib/io/test/get_line.c
@@ -16,7 +16,7 @@ static void run_test_case(const char *raw, const line_t *lines, size_t count,
 			  int flags)
 {
 	size_t i, line_num, old_line_num;
-	istream_t *fp;
+	sqfs_istream_t *fp;
 	char *line;
 	int ret;
 
diff --git a/lib/io/test/istream_mem.c b/lib/io/test/istream_mem.c
index ca5146c..f364fd3 100644
--- a/lib/io/test/istream_mem.c
+++ b/lib/io/test/istream_mem.c
@@ -35,7 +35,7 @@ int main(int argc, char **argv)
 	size_t i, diff, size;
 	bool eat_all = true;
 	const sqfs_u8 *ptr;
-	istream_t *in;
+	sqfs_istream_t *in;
 	int ret;
 	(void)argc; (void)argv;
 
diff --git a/lib/io/test/istream_read.c b/lib/io/test/istream_read.c
index 8ba4540..66fec4b 100644
--- a/lib/io/test/istream_read.c
+++ b/lib/io/test/istream_read.c
@@ -35,7 +35,7 @@ int main(int argc, char **argv)
 {
 	sqfs_u8 read_buffer[61];
 	sqfs_u64 read_off = 0;
-	istream_t *dummy;
+	sqfs_istream_t *dummy;
 	(void)argc; (void)argv;
 
 	init_rd_buffer();
diff --git a/lib/io/test/istream_skip.c b/lib/io/test/istream_skip.c
index 3a02c8c..0fc3e11 100644
--- a/lib/io/test/istream_skip.c
+++ b/lib/io/test/istream_skip.c
@@ -35,7 +35,7 @@ int main(int argc, char **argv)
 {
 	sqfs_u8 read_buffer[61];
 	sqfs_u64 read_off = 0;
-	istream_t *dummy;
+	sqfs_istream_t *dummy;
 	(void)argc; (void)argv;
 
 	init_rd_buffer();
diff --git a/lib/io/test/stream_splice.c b/lib/io/test/stream_splice.c
index 754f9cb..a9edd76 100644
--- a/lib/io/test/stream_splice.c
+++ b/lib/io/test/stream_splice.c
@@ -34,11 +34,11 @@ static void init_rd_buffer(void)
 
 /*****************************************************************************/
 
-static int out_append(ostream_t *strm, const void *data, size_t size);
+static int out_append(sqfs_ostream_t *strm, const void *data, size_t size);
 
 static sqfs_u64 out_offset = 0;
 
-static ostream_t out = {
+static sqfs_ostream_t out = {
 	{ 1, NULL, NULL },
 	out_append,
 	NULL,
@@ -46,7 +46,7 @@ static ostream_t out = {
 	NULL,
 };
 
-static int out_append(ostream_t *strm, const void *data, size_t size)
+static int out_append(sqfs_ostream_t *strm, const void *data, size_t size)
 {
 	const sqfs_u8 *ptr = data;
 
@@ -69,7 +69,7 @@ static int out_append(ostream_t *strm, const void *data, size_t size)
 int main(int argc, char **argv)
 {
 	sqfs_u64 total = 0;
-	istream_t *in;
+	sqfs_istream_t *in;
 	sqfs_s32 ret;
 	(void)argc; (void)argv;
 
diff --git a/lib/io/test/xfrm.c b/lib/io/test/xfrm.c
index 184db9e..1b48e6f 100644
--- a/lib/io/test/xfrm.c
+++ b/lib/io/test/xfrm.c
@@ -368,17 +368,17 @@ static size_t mo_written = 0;
 static sqfs_u8 mo_buffer[1024];
 static bool mo_flushed = false;
 
-static int mem_append(ostream_t *strm, const void *data, size_t size);
-static int mem_flush(ostream_t *strm);
+static int mem_append(sqfs_ostream_t *strm, const void *data, size_t size);
+static int mem_flush(sqfs_ostream_t *strm);
 
-static ostream_t mem_ostream = {
+static sqfs_ostream_t mem_ostream = {
 	{ 1, NULL, NULL, },
 	mem_append,
 	mem_flush,
 	NULL,
 };
 
-static int mem_append(ostream_t *strm, const void *data, size_t size)
+static int mem_append(sqfs_ostream_t *strm, const void *data, size_t size)
 {
 	TEST_ASSERT(strm == &mem_ostream);
 	TEST_ASSERT(size > 0);
@@ -396,7 +396,7 @@ static int mem_append(ostream_t *strm, const void *data, size_t size)
 	return 0;
 }
 
-static int mem_flush(ostream_t *strm)
+static int mem_flush(sqfs_ostream_t *strm)
 {
 	TEST_ASSERT(strm == &mem_ostream);
 	TEST_ASSERT(!mo_flushed);
@@ -408,7 +408,7 @@ static int mem_flush(ostream_t *strm)
 
 static void run_unpack_test(const void *blob, size_t size)
 {
-	istream_t *istream, *mem_istream;
+	sqfs_istream_t *istream, *mem_istream;
 	xfrm_stream_t *xfrm;
 	sqfs_s32 ret;
 	size_t i;
@@ -450,8 +450,8 @@ static void run_unpack_test(const void *blob, size_t size)
 
 static void run_pack_test(void)
 {
+	sqfs_ostream_t *ostream;
 	xfrm_stream_t *xfrm;
-	ostream_t *ostream;
 	size_t i;
 	int ret;