5 files changed, 11 insertions, 11 deletions
diff --git a/src/target/etm.c b/src/target/etm.c
index a4ff6c5f..6d34f6c9 100644
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -1788,7 +1788,7 @@ COMMAND_HANDLER(handle_etm_image_command)
 
 COMMAND_HANDLER(handle_etm_dump_command)
 {
-	fileio_t file;
+	struct fileio file;
 	target_t *target;
 	struct arm *arm;
 	etm_context_t *etm_ctx;
@@ -1856,7 +1856,7 @@ COMMAND_HANDLER(handle_etm_dump_command)
 
 COMMAND_HANDLER(handle_etm_load_command)
 {
-	fileio_t file;
+	struct fileio file;
 	target_t *target;
 	struct arm *arm;
 	etm_context_t *etm_ctx;
diff --git a/src/target/image.c b/src/target/image.c
index cf7e11ab..9a9c9553 100644
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -47,7 +47,7 @@
 static int autodetect_image_type(image_t *image, const char *url)
 {
 	int retval;
-	fileio_t fileio;
+	struct fileio fileio;
 	uint32_t read_bytes;
 	uint8_t buffer[9];
 
@@ -150,7 +150,7 @@ static int identify_image_type(image_t *image, const char *type_string, const ch
 static int image_ihex_buffer_complete(image_t *image)
 {
 	image_ihex_t *ihex = image->type_private;
-	fileio_t *fileio = &ihex->fileio;
+	struct fileio *fileio = &ihex->fileio;
 	uint32_t full_address = 0x0;
 	uint32_t cooked_bytes;
 	int i;
@@ -502,7 +502,7 @@ static int image_elf_read_section(image_t *image, int section, uint32_t offset,
 static int image_mot_buffer_complete(image_t *image)
 {
 	image_mot_t *mot = image->type_private;
-	fileio_t *fileio = &mot->fileio;
+	struct fileio *fileio = &mot->fileio;
 	uint32_t full_address = 0x0;
 	uint32_t cooked_bytes;
 	int i;
diff --git a/src/target/image.h b/src/target/image.h
index 30240d56..a1e24c44 100644
--- a/src/target/image.h
+++ b/src/target/image.h
@@ -69,12 +69,12 @@ typedef struct image_s
 
 typedef struct image_binary_s
 {
-	fileio_t fileio;
+	struct fileio fileio;
 } image_binary_t;
 
 typedef struct image_ihex_s
 {
-	fileio_t fileio;
+	struct fileio fileio;
 	uint8_t *buffer;
 } image_ihex_t;
 
@@ -87,7 +87,7 @@ typedef struct image_memory_s
 
 typedef struct fileio_elf_s
 {
-	fileio_t fileio;
+	struct fileio fileio;
 	Elf32_Ehdr *header;
 	Elf32_Phdr *segments;
 	uint32_t segment_count;
@@ -96,7 +96,7 @@ typedef struct fileio_elf_s
 
 typedef struct image_mot_s
 {
-	fileio_t fileio;
+	struct fileio fileio;
 	uint8_t *buffer;
 } image_mot_t;
 
diff --git a/src/target/target.c b/src/target/target.c
index 8cc46ecd..6346ae03 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -2493,7 +2493,7 @@ COMMAND_HANDLER(handle_load_image_command)
 
 COMMAND_HANDLER(handle_dump_image_command)
 {
-	fileio_t fileio;
+	struct fileio fileio;
 
 	uint8_t buffer[560];
 	int retvaltemp;
diff --git a/src/target/xscale.c b/src/target/xscale.c
index e18d5916..88914b52 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -3420,7 +3420,7 @@ COMMAND_HANDLER(xscale_handle_dump_trace_command)
 	target_t *target = get_current_target(cmd_ctx);
 	struct xscale_common_s *xscale = target_to_xscale(target);
 	xscale_trace_data_t *trace_data;
-	fileio_t file;
+	struct fileio file;
 	int retval;
 
 	retval = xscale_verify_pointer(cmd_ctx, xscale);