diff --git a/urjtag/include/cable.h b/urjtag/include/cable.h
index 12916dbc..3e43b01f 100644
--- a/urjtag/include/cable.h
+++ b/urjtag/include/cable.h
@@ -37,7 +37,7 @@ typedef struct urj_cable urj_cable_t;
 
 typedef struct urj_cable_driver urj_cable_driver_t;
 
-typedef enum
+typedef enum urj_cable_flush_amount
 {
     URJ_TAP_CABLE_OPTIONALLY,
     URJ_TAP_CABLE_TO_OUTPUT,
diff --git a/urjtag/include/jim.h b/urjtag/include/jim.h
index 6951389d..42e7b562 100644
--- a/urjtag/include/jim.h
+++ b/urjtag/include/jim.h
@@ -37,24 +37,24 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-typedef enum
+typedef enum jim_tap_state
 {
-    URJ_JIM_RESET = 0,
-    URJ_JIM_SELECT_DR = 0 + 1,
-    URJ_JIM_CAPTURE_DR = 0 + 2,
-    URJ_JIM_SHIFT_DR = 0 + 3,
-    URJ_JIM_EXIT1_DR = 0 + 4,
-    URJ_JIM_PAUSE_DR = 0 + 5,
-    URJ_JIM_EXIT2_DR = 0 + 6,
-    URJ_JIM_UPDATE_DR = 0 + 7,
-    URJ_JIM_IDLE = 8,
-    URJ_JIM_SELECT_IR = 8 + 1,
-    URJ_JIM_CAPTURE_IR = 8 + 2,
-    URJ_JIM_SHIFT_IR = 8 + 3,
-    URJ_JIM_EXIT1_IR = 8 + 4,
-    URJ_JIM_PAUSE_IR = 8 + 5,
-    URJ_JIM_EXIT2_IR = 8 + 6,
-    URJ_JIM_UPDATE_IR = 8 + 7,
+    URJ_JIM_RESET       = 0,
+    URJ_JIM_SELECT_DR   = 0 + 1,
+    URJ_JIM_CAPTURE_DR  = 0 + 2,
+    URJ_JIM_SHIFT_DR    = 0 + 3,
+    URJ_JIM_EXIT1_DR    = 0 + 4,
+    URJ_JIM_PAUSE_DR    = 0 + 5,
+    URJ_JIM_EXIT2_DR    = 0 + 6,
+    URJ_JIM_UPDATE_DR   = 0 + 7,
+    URJ_JIM_IDLE        = 8,
+    URJ_JIM_SELECT_IR   = 8 + 1,
+    URJ_JIM_CAPTURE_IR  = 8 + 2,
+    URJ_JIM_SHIFT_IR    = 8 + 3,
+    URJ_JIM_EXIT1_IR    = 8 + 4,
+    URJ_JIM_PAUSE_IR    = 8 + 5,
+    URJ_JIM_EXIT2_IR    = 8 + 6,
+    URJ_JIM_UPDATE_IR   = 8 + 7,
 }
 urj_jim_tap_state_t;
 
diff --git a/urjtag/include/pod.h b/urjtag/include/pod.h
index e4d0dd5f..00868e42 100644
--- a/urjtag/include/pod.h
+++ b/urjtag/include/pod.h
@@ -24,7 +24,7 @@
 #ifndef URJ_POD_H
 #define URJ_POD_H
 
-typedef enum
+typedef enum urj_pod_sigsel
 {
     URJ_POD_CS_NONE = 0,        // no/invalid signal
     URJ_POD_CS_TDI = (1 << 0),  // out: JTAG/SPI data in