diff --git a/MAINTAINERS b/MAINTAINERS
index 44d84aa243..5d33892c34 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3656,7 +3656,7 @@ M: Peter Xu <peterx@redhat.com>
 M: Fabiano Rosas <farosas@suse.de>
 S: Maintained
 F: hw/core/vmstate-if.c
-F: include/hw/vmstate-if.h
+F: include/hw/core/vmstate-if.h
 F: include/migration/
 F: include/qemu/userfaultfd.h
 F: migration/
diff --git a/hw/core/vmstate-if.c b/hw/core/vmstate-if.c
index bf453620fe..c39631c758 100644
--- a/hw/core/vmstate-if.c
+++ b/hw/core/vmstate-if.c
@@ -7,7 +7,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/vmstate-if.h"
+#include "hw/core/vmstate-if.h"
 
 static const TypeInfo vmstate_if_info = {
     .name = TYPE_VMSTATE_IF,
diff --git a/include/hw/vmstate-if.h b/include/hw/core/vmstate-if.h
similarity index 100%
rename from include/hw/vmstate-if.h
rename to include/hw/core/vmstate-if.h
diff --git a/include/migration/register.h b/include/migration/register.h
index ae79794cdd..d0f37f5f43 100644
--- a/include/migration/register.h
+++ b/include/migration/register.h
@@ -14,7 +14,7 @@
 #ifndef MIGRATION_REGISTER_H
 #define MIGRATION_REGISTER_H
 
-#include "hw/vmstate-if.h"
+#include "hw/core/vmstate-if.h"
 
 /**
  * struct SaveVMHandlers: handler structure to finely control
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index a87a5efa42..ed9095a466 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -27,7 +27,7 @@
 #ifndef QEMU_VMSTATE_H
 #define QEMU_VMSTATE_H
 
-#include "hw/vmstate-if.h"
+#include "hw/core/vmstate-if.h"
 
 typedef struct VMStateInfo VMStateInfo;
 typedef struct VMStateField VMStateField;