diff --git a/src/northbridge/intel/x4x/hostbridge_regs.h b/src/northbridge/intel/x4x/registers/host_bridge.h
similarity index 88%
rename from src/northbridge/intel/x4x/hostbridge_regs.h
rename to src/northbridge/intel/x4x/registers/host_bridge.h
index 00b496dca8..f09240416f 100644
--- a/src/northbridge/intel/x4x/hostbridge_regs.h
+++ b/src/northbridge/intel/x4x/registers/host_bridge.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef __X4X_HOSTBRIDGE_REGS_H__
-#define __X4X_HOSTBRIDGE_REGS_H__
+#ifndef __X4X_REGISTERS_HOSTBRIDGE_H__
+#define __X4X_REGISTERS_HOSTBRIDGE_H__
 
 #define D0F0_EPBAR_LO	0x40
 #define D0F0_EPBAR_HI	0x44
@@ -37,4 +37,4 @@
 #define D0F0_SKPD	0xdc /* Scratchpad Data */
 #define D0F0_CAPID0	0xe0
 
-#endif /* __X4X_HOSTBRIDGE_REGS_H__ */
+#endif /* __X4X_REGISTERS_HOSTBRIDGE_H__ */
diff --git a/src/northbridge/intel/x4x/x4x.h b/src/northbridge/intel/x4x/x4x.h
index c62428705f..25345756e0 100644
--- a/src/northbridge/intel/x4x/x4x.h
+++ b/src/northbridge/intel/x4x/x4x.h
@@ -11,7 +11,7 @@
  */
 #define HOST_BRIDGE	PCI_DEV(0, 0, 0)
 
-#include "hostbridge_regs.h"
+#include "registers/host_bridge.h"
 
 /*
  * D1:F0 PEG