diff --git a/src/platforms/hosted/platform.h b/src/platforms/hosted/platform.h
index 50f1cbc..b7a86e7 100644
--- a/src/platforms/hosted/platform.h
+++ b/src/platforms/hosted/platform.h
@@ -31,7 +31,7 @@ void platform_buffer_flush(void);
 
 #define VENDOR_ID_SEGGER         0x1366
 
-typedef enum bmp_type_s {
+typedef enum bmp_type_e {
 	BMP_TYPE_NONE = 0,
 	BMP_TYPE_BMP,
 	BMP_TYPE_STLINKV2,
diff --git a/src/platforms/hosted/stlinkv2.c b/src/platforms/hosted/stlinkv2.c
index 727db37..62a8c45 100644
--- a/src/platforms/hosted/stlinkv2.c
+++ b/src/platforms/hosted/stlinkv2.c
@@ -202,9 +202,9 @@ typedef struct {
 	uint8_t      ver_bridge;
 	uint16_t     block_size;
 	bool         ap_error;
-} stlink;
+} stlink_t;
 
-stlink Stlink;
+stlink_t Stlink;
 
 static int stlink_usb_get_rw_status(bool verbose);