diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk
index ba1874d347..7d521c1295 100644
--- a/build-aux/syntax-check.mk
+++ b/build-aux/syntax-check.mk
@@ -2119,7 +2119,7 @@ exclude_file_name_regexp--sc_prohibit_readdir = \
   ^(tests/(.*mock|virfilewrapper)\.c|tools/nss/libvirt_nss\.c)$$
 
 exclude_file_name_regexp--sc_prohibit_cross_inclusion = \
-  ^(src/util/virclosecallbacks\.h|src/util/virhostdev\.h)$$
+  ^(src/util/virclosecallbacks\.h)$$
 
 exclude_file_name_regexp--sc_prohibit_dirent_d_type = \
   ^(src/util/vircgroup.c)$
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1675c45206..975de75037 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -80,6 +80,7 @@
 @SRCDIR@/src/hyperv/hyperv_wmi.c
 @SRCDIR@/src/hypervisor/domain_cgroup.c
 @SRCDIR@/src/hypervisor/domain_driver.c
+@SRCDIR@/src/hypervisor/virhostdev.c
 @SRCDIR@/src/interface/interface_backend_netcf.c
 @SRCDIR@/src/interface/interface_backend_udev.c
 @SRCDIR@/src/internal.h
@@ -250,7 +251,6 @@
 @SRCDIR@/src/util/virhash.c
 @SRCDIR@/src/util/virhook.c
 @SRCDIR@/src/util/virhostcpu.c
-@SRCDIR@/src/util/virhostdev.c
 @SRCDIR@/src/util/virhostmem.c
 @SRCDIR@/src/util/virhostuptime.c
 @SRCDIR@/src/util/viridentity.c
diff --git a/src/hypervisor/Makefile.inc.am b/src/hypervisor/Makefile.inc.am
index 02cf2c7cb1..3bd775a4a5 100644
--- a/src/hypervisor/Makefile.inc.am
+++ b/src/hypervisor/Makefile.inc.am
@@ -5,6 +5,8 @@ HYPERVISOR_SOURCES = \
 	hypervisor/domain_cgroup.c \
 	hypervisor/domain_driver.h \
 	hypervisor/domain_driver.c \
+	hypervisor/virhostdev.h \
+	hypervisor/virhostdev.c \
 	$(NULL)
 
 noinst_LTLIBRARIES += libvirt_hypervisor.la
diff --git a/src/util/virhostdev.c b/src/hypervisor/virhostdev.c
similarity index 100%
rename from src/util/virhostdev.c
rename to src/hypervisor/virhostdev.c
diff --git a/src/util/virhostdev.h b/src/hypervisor/virhostdev.h
similarity index 100%
rename from src/util/virhostdev.h
rename to src/hypervisor/virhostdev.h
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 05e1bc875b..85b1eca72f 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1406,6 +1406,36 @@ virDomainDriverParseBlkioDeviceStr;
 virDomainDriverSetupPersistentDefBlkioParams;
 
 
+# hypervisor/virhostdev.h
+virHostdevFindUSBDevice;
+virHostdevManagerGetDefault;
+virHostdevPCINodeDeviceDetach;
+virHostdevPCINodeDeviceReAttach;
+virHostdevPCINodeDeviceReset;
+virHostdevPrepareDomainDevices;
+virHostdevPrepareMediatedDevices;
+virHostdevPrepareNVMeDevices;
+virHostdevPrepareOneNVMeDevice;
+virHostdevPreparePCIDevices;
+virHostdevPrepareSCSIDevices;
+virHostdevPrepareSCSIVHostDevices;
+virHostdevPrepareUSBDevices;
+virHostdevReAttachDomainDevices;
+virHostdevReAttachMediatedDevices;
+virHostdevReAttachNVMeDevices;
+virHostdevReAttachOneNVMeDevice;
+virHostdevReAttachPCIDevices;
+virHostdevReAttachSCSIDevices;
+virHostdevReAttachSCSIVHostDevices;
+virHostdevReAttachUSBDevices;
+virHostdevUpdateActiveDomainDevices;
+virHostdevUpdateActiveMediatedDevices;
+virHostdevUpdateActiveNVMeDevices;
+virHostdevUpdateActivePCIDevices;
+virHostdevUpdateActiveSCSIDevices;
+virHostdevUpdateActiveUSBDevices;
+
+
 # libvirt_internal.h
 virConnectSupportsFeature;
 virDomainMigrateBegin3;
@@ -2169,36 +2199,6 @@ virHostCPUHasBitmap;
 virHostCPUStatsAssign;
 
 
-# util/virhostdev.h
-virHostdevFindUSBDevice;
-virHostdevManagerGetDefault;
-virHostdevPCINodeDeviceDetach;
-virHostdevPCINodeDeviceReAttach;
-virHostdevPCINodeDeviceReset;
-virHostdevPrepareDomainDevices;
-virHostdevPrepareMediatedDevices;
-virHostdevPrepareNVMeDevices;
-virHostdevPrepareOneNVMeDevice;
-virHostdevPreparePCIDevices;
-virHostdevPrepareSCSIDevices;
-virHostdevPrepareSCSIVHostDevices;
-virHostdevPrepareUSBDevices;
-virHostdevReAttachDomainDevices;
-virHostdevReAttachMediatedDevices;
-virHostdevReAttachNVMeDevices;
-virHostdevReAttachOneNVMeDevice;
-virHostdevReAttachPCIDevices;
-virHostdevReAttachSCSIDevices;
-virHostdevReAttachSCSIVHostDevices;
-virHostdevReAttachUSBDevices;
-virHostdevUpdateActiveDomainDevices;
-virHostdevUpdateActiveMediatedDevices;
-virHostdevUpdateActiveNVMeDevices;
-virHostdevUpdateActivePCIDevices;
-virHostdevUpdateActiveSCSIDevices;
-virHostdevUpdateActiveUSBDevices;
-
-
 # util/virhostmem.h
 virHostMemAllocPages;
 virHostMemGetCellsFree;
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index 4dc1b9d039..ff6a2b0f69 100644
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -46,6 +46,7 @@ libvirt_driver_libxl_impl_la_CFLAGS = \
 	-I$(builddir)/access \
 	-I$(srcdir)/conf \
 	-I$(srcdir)/secret \
+	-I$(srcdir)/hypervisor \
 	$(AM_CFLAGS) \
 	$(NULL)
 libvirt_driver_libxl_impl_la_LDFLAGS = $(AM_LDFLAGS)
diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am
index 823d80c5dd..5f2f4c8e2d 100644
--- a/src/security/Makefile.inc.am
+++ b/src/security/Makefile.inc.am
@@ -100,6 +100,7 @@ virt_aa_helper_LDADD += libvirt_probes.lo
 endif WITH_DTRACE_PROBES
 virt_aa_helper_CFLAGS = \
 	-I$(srcdir)/conf \
+	-I$(top_srcdir)/src/hypervisor \
 	-I$(srcdir)/security \
 	$(AM_CFLAGS) \
 	$(PIE_CFLAGS) \
diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am
index fbe67090d3..a340fdeffb 100644
--- a/src/util/Makefile.inc.am
+++ b/src/util/Makefile.inc.am
@@ -92,8 +92,6 @@ UTIL_SOURCES = \
 	util/virhostcpu.c \
 	util/virhostcpu.h \
 	util/virhostcpupriv.h \
-	util/virhostdev.c \
-	util/virhostdev.h \
 	util/virhostmem.c \
 	util/virhostmem.h \
 	util/virhostuptime.c \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ed5255b62d..bfb8e34378 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,6 +22,7 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/util \
 	-I$(top_srcdir)/src/conf \
+	-I$(top_srcdir)/src/hypervisor \
 	-I$(top_builddir)/src/rpc \
 	$(NULL)