diff --git a/hw/xbox/mcpx/apu_regs.h b/hw/xbox/mcpx/apu_regs.h
index 7488c2e267..2fa71593ae 100644
--- a/hw/xbox/mcpx/apu_regs.h
+++ b/hw/xbox/mcpx/apu_regs.h
@@ -22,6 +22,8 @@
 #ifndef MCPX_APU_REGS_H
 #define MCPX_APU_REGS_H
 
+// clang-format off
+
 #define NV_PAPU_ISTS                                     0x00001000
 #   define NV_PAPU_ISTS_GINTSTS                               (1 << 0)
 #   define NV_PAPU_ISTS_FETINTSTS                             (1 << 4)
@@ -343,4 +345,6 @@ enum MCPX_HW_NOTIFIER {
 #define NV1BA0_NOTIFICATION_STATUS_DONE_SUCCESS       0x01
 #define NV1BA0_NOTIFICATION_STATUS_IN_PROGRESS        0x80
 
+// clang-format on
+
 #endif
diff --git a/hw/xbox/nv2a/nv2a_regs.h b/hw/xbox/nv2a/nv2a_regs.h
index 78a9091eb5..fa657bf271 100644
--- a/hw/xbox/nv2a/nv2a_regs.h
+++ b/hw/xbox/nv2a/nv2a_regs.h
@@ -32,6 +32,8 @@
         (v) |= ((__val) << ctz32(__mask)) & (__mask);     \
     })
 
+// clang-format off
+
 #define NV_NUM_BLOCKS 21
 #define NV_PMC          0   /* card master control */
 #define NV_PBUS         1   /* bus control */
@@ -1463,4 +1465,6 @@
 
 #define NV2A_CUBEMAP_FACE_ALIGNMENT 128
 
+// clang-format on
+
 #endif
diff --git a/hw/xbox/nvnet_regs.h b/hw/xbox/nvnet_regs.h
index 992f609937..7a1744f7bc 100644
--- a/hw/xbox/nvnet_regs.h
+++ b/hw/xbox/nvnet_regs.h
@@ -68,6 +68,8 @@
 #ifndef HW_NVNET_REGS_H
 #define HW_NVNET_REGS_H
 
+// clang-format on
+
 #define DEV_NEED_LASTPACKET1 0x0001
 #define DEV_IRQMASK_1        0x0002
 #define DEV_IRQMASK_2        0x0004
@@ -291,4 +293,6 @@ enum {
 #define LPA_LPACK    0x4000  /* Link partner acked us       */
 #define LPA_NPAGE    0x8000  /* Next page bit               */
 
+// clang-format off
+
 #endif /* HW_NVNET_REGS_H */