diff --git a/src/target/avr_pdi.c b/src/target/avr_pdi.c
index 2b043a0e8f8..58f60523c53 100644
--- a/src/target/avr_pdi.c
+++ b/src/target/avr_pdi.c
@@ -63,10 +63,6 @@
 
 #define PDI_MODE_MASK 0xf3U
 
-#define PDI_REG_STATUS 0U
-#define PDI_REG_RESET  1U
-#define PDI_REG_CTRL   2U
-
 #define PDI_RESET 0x59U
 
 typedef enum pdi_key {
diff --git a/src/target/avr_pdi.h b/src/target/avr_pdi.h
index 2379dc654be..578d108fdee 100644
--- a/src/target/avr_pdi.h
+++ b/src/target/avr_pdi.h
@@ -76,8 +76,11 @@ typedef struct __attribute__((packed)) avr_regs {
 #define PDI_DATA_24 0x02U
 #define PDI_DATA_32 0x03U
 
-#define PDI_REG_R3 3U
-#define PDI_REG_R4 4U
+#define PDI_REG_STATUS 0U
+#define PDI_REG_RESET  1U
+#define PDI_REG_CTRL   2U
+#define PDI_REG_R3     3U
+#define PDI_REG_R4     4U
 
 #define PDI_MODE_IND_PTR    0x00U
 #define PDI_MODE_IND_INCPTR 0x04U