diff --git a/src/jtag/aice/aice_usb.c b/src/jtag/aice/aice_usb.c
index 3a0e48522..751fd135c 100644
--- a/src/jtag/aice/aice_usb.c
+++ b/src/jtag/aice/aice_usb.c
@@ -53,29 +53,29 @@ static enum aice_target_endian data_endian;
 #define AICE_FORMAT_DTHMB       (4)
 
 /* Constants for AICE command */
-static const uint8_t AICE_CMD_SCAN_CHAIN = 0x00;
-static const uint8_t AICE_CMD_T_READ_MISC = 0x20;
-static const uint8_t AICE_CMD_T_READ_EDMSR = 0x21;
-static const uint8_t AICE_CMD_T_READ_DTR = 0x22;
-static const uint8_t AICE_CMD_T_READ_MEM_B = 0x24;
-static const uint8_t AICE_CMD_T_READ_MEM_H = 0x25;
-static const uint8_t AICE_CMD_T_READ_MEM = 0x26;
-static const uint8_t AICE_CMD_T_FASTREAD_MEM = 0x27;
-static const uint8_t AICE_CMD_T_WRITE_MISC = 0x28;
-static const uint8_t AICE_CMD_T_WRITE_EDMSR	= 0x29;
-static const uint8_t AICE_CMD_T_WRITE_DTR = 0x2A;
-static const uint8_t AICE_CMD_T_WRITE_DIM = 0x2B;
-static const uint8_t AICE_CMD_T_WRITE_MEM_B = 0x2C;
-static const uint8_t AICE_CMD_T_WRITE_MEM_H = 0x2D;
-static const uint8_t AICE_CMD_T_WRITE_MEM = 0x2E;
-static const uint8_t AICE_CMD_T_FASTWRITE_MEM = 0x2F;
-static const uint8_t AICE_CMD_T_EXECUTE = 0x3E;
-static const uint8_t AICE_CMD_READ_CTRL = 0x50;
-static const uint8_t AICE_CMD_WRITE_CTRL = 0x51;
-static const uint8_t AICE_CMD_BATCH_BUFFER_READ = 0x60;
-static const uint8_t AICE_CMD_READ_DTR_TO_BUFFER = 0x61;
-static const uint8_t AICE_CMD_BATCH_BUFFER_WRITE = 0x68;
-static const uint8_t AICE_CMD_WRITE_DTR_FROM_BUFFER = 0x69;
+#define AICE_CMD_SCAN_CHAIN             0x00
+#define AICE_CMD_T_READ_MISC            0x20
+#define AICE_CMD_T_READ_EDMSR           0x21
+#define AICE_CMD_T_READ_DTR             0x22
+#define AICE_CMD_T_READ_MEM_B           0x24
+#define AICE_CMD_T_READ_MEM_H           0x25
+#define AICE_CMD_T_READ_MEM             0x26
+#define AICE_CMD_T_FASTREAD_MEM         0x27
+#define AICE_CMD_T_WRITE_MISC           0x28
+#define AICE_CMD_T_WRITE_EDMSR          0x29
+#define AICE_CMD_T_WRITE_DTR            0x2A
+#define AICE_CMD_T_WRITE_DIM            0x2B
+#define AICE_CMD_T_WRITE_MEM_B          0x2C
+#define AICE_CMD_T_WRITE_MEM_H          0x2D
+#define AICE_CMD_T_WRITE_MEM            0x2E
+#define AICE_CMD_T_FASTWRITE_MEM        0x2F
+#define AICE_CMD_T_EXECUTE              0x3E
+#define AICE_CMD_READ_CTRL              0x50
+#define AICE_CMD_WRITE_CTRL             0x51
+#define AICE_CMD_BATCH_BUFFER_READ      0x60
+#define AICE_CMD_READ_DTR_TO_BUFFER     0x61
+#define AICE_CMD_BATCH_BUFFER_WRITE     0x68
+#define AICE_CMD_WRITE_DTR_FROM_BUFFER  0x69
 
 /***************************************************************************/
 /* AICE commands' pack/unpack functions */