diff --git a/src/platforms/hosted/bmp_libusb.c b/src/platforms/hosted/bmp_libusb.c
index 7f31b62..11faa16 100644
--- a/src/platforms/hosted/bmp_libusb.c
+++ b/src/platforms/hosted/bmp_libusb.c
@@ -20,7 +20,7 @@
 /* Find all known usb connected debuggers */
 #include "general.h"
 #include "libusb-1.0/libusb.h"
-#include "cl_utils.h"
+#include "cli.h"
 #include "ftdi_bmp.h"
 #include "version.h"
 
diff --git a/src/platforms/hosted/jlink.c b/src/platforms/hosted/jlink.c
index d1d1220..0f9c22f 100644
--- a/src/platforms/hosted/jlink.c
+++ b/src/platforms/hosted/jlink.c
@@ -30,7 +30,7 @@
 #include <ctype.h>
 #include <sys/time.h>
 
-#include "cl_utils.h"
+#include "cli.h"
 #include "jlink.h"
 
 #define USB_PID_SEGGER       0x1366
diff --git a/src/platforms/hosted/jlink_adiv5_swdp.c b/src/platforms/hosted/jlink_adiv5_swdp.c
index 44aacd0..fa6a574 100644
--- a/src/platforms/hosted/jlink_adiv5_swdp.c
+++ b/src/platforms/hosted/jlink_adiv5_swdp.c
@@ -30,7 +30,7 @@
 #include "target_internal.h"
 #include "adiv5.h"
 #include "jlink.h"
-#include "cl_utils.h"
+#include "cli.h"
 
 #define SWDP_ACK_OK    0x01
 #define SWDP_ACK_WAIT  0x02
diff --git a/src/platforms/hosted/jlink_jtagtap.c b/src/platforms/hosted/jlink_jtagtap.c
index 17dd3a2..c70da7f 100644
--- a/src/platforms/hosted/jlink_jtagtap.c
+++ b/src/platforms/hosted/jlink_jtagtap.c
@@ -28,7 +28,7 @@
 #include "exception.h"
 
 #include "jlink.h"
-#include "cl_utils.h"
+#include "cli.h"
 
 static void jtagtap_reset(void)
 {
diff --git a/src/platforms/hosted/stlinkv2.c b/src/platforms/hosted/stlinkv2.c
index 1a814de..24c440f 100644
--- a/src/platforms/hosted/stlinkv2.c
+++ b/src/platforms/hosted/stlinkv2.c
@@ -40,7 +40,7 @@
 #include <ctype.h>
 #include <sys/time.h>
 
-#include "cl_utils.h"
+#include "cli.h"
 
 #define STLINK_SWIM_ERR_OK             0x00
 #define STLINK_SWIM_BUSY               0x01