diff --git a/PDP11/pdp11_rp.c b/PDP11/pdp11_rp.c
index 849c490b..af17e39f 100644
--- a/PDP11/pdp11_rp.c
+++ b/PDP11/pdp11_rp.c
@@ -84,11 +84,11 @@
 
 /* Flags in the unit flags word */
 
-#define UNIT_V_WLK      (UNIT_V_UF + 0)                 /* write locked */
-#define UNIT_V_DTYPE    (UNIT_V_UF + 1)                 /* disk type */
+#define UNIT_V_WLK      (DKUF_V_UF + 0)                 /* write locked */
+#define UNIT_V_DTYPE    (DKUF_V_UF + 1)                 /* disk type */
 #define UNIT_M_DTYPE    7
-#define UNIT_V_AUTO     (UNIT_V_UF + 4)                 /* autosize */
-#define UNIT_V_DUMMY    (UNIT_V_UF + 5)                 /* dummy flag */
+#define UNIT_V_AUTO     (DKUF_V_UF + 4)                 /* autosize */
+#define UNIT_V_DUMMY    (DKUF_V_UF + 5)                 /* dummy flag */
 #define UNIT_WLK        (1 << UNIT_V_WLK)
 #define UNIT_DTYPE      (UNIT_M_DTYPE << UNIT_V_DTYPE)
 #define UNIT_AUTO       (1 << UNIT_V_AUTO)
diff --git a/PDP11/pdp11_rq.c b/PDP11/pdp11_rq.c
index f0962a9c..1f680caf 100644
--- a/PDP11/pdp11_rq.c
+++ b/PDP11/pdp11_rq.c
@@ -155,12 +155,12 @@ extern uint32 cpu_opt;
 #define RQ_MAPXFER      (1u << 31)                      /* mapped xfer */
 #define RQ_M_PFN        0x1FFFFF                        /* map entry PFN */
 
-#define UNIT_V_ONL      (UNIT_V_UF + 0)                 /* online */
-#define UNIT_V_WLK      (UNIT_V_UF + 1)                 /* hwre write lock */
-#define UNIT_V_ATP      (UNIT_V_UF + 2)                 /* attn pending */
-#define UNIT_V_DTYPE    (UNIT_V_UF + 3)                 /* drive type */
+#define UNIT_V_ONL      (DKUF_V_UF + 0)                 /* online */
+#define UNIT_V_WLK      (DKUF_V_UF + 1)                 /* hwre write lock */
+#define UNIT_V_ATP      (DKUF_V_UF + 2)                 /* attn pending */
+#define UNIT_V_DTYPE    (DKUF_V_UF + 3)                 /* drive type */
 #define UNIT_M_DTYPE    0x1F
-#define UNIT_V_NOAUTO   (UNIT_V_UF + 8)                 /* noautosize */
+#define UNIT_V_NOAUTO   (DKUF_V_UF + 8)                 /* noautosize */
 #define UNIT_ONL        (1 << UNIT_V_ONL)
 #define UNIT_WLK        (1 << UNIT_V_WLK)
 #define UNIT_ATP        (1 << UNIT_V_ATP)
diff --git a/sim_disk.h b/sim_disk.h
index dbff7017..a95ff36d 100644
--- a/sim_disk.h
+++ b/sim_disk.h
@@ -37,9 +37,9 @@ typedef uint32          t_lba;                          /* disk logical block ad
 
 /* Unit flags */
 
-#define DKUF_V_WLK      (UNIT_V_UF + 12)                /* write locked */
-#define DKUF_V_FMT      (UNIT_V_UF + 13)                /* disk file format */
-#define DKUF_W_FMT      3                               /* 3b of formats */
+#define DKUF_V_WLK      (UNIT_V_UF + 0)                 /* write locked */
+#define DKUF_V_FMT      (UNIT_V_UF + 1)                 /* disk file format */
+#define DKUF_W_FMT      2                               /* 2b of formats */
 #define DKUF_N_FMT      (1u << DKUF_W_FMT)              /* number of formats */
 #define DKUF_M_FMT      ((1u << DKUF_W_FMT) - 1)
 #define DKUF_F_STD       0                              /* SIMH format */