diff --git a/src/xrt/auxiliary/util/u_meta_prober.h b/src/xrt/auxiliary/util/u_meta_prober.h
index 3dfb148a2..e3b205da2 100644
--- a/src/xrt/auxiliary/util/u_meta_prober.h
+++ b/src/xrt/auxiliary/util/u_meta_prober.h
@@ -12,12 +12,16 @@
 #include <stdlib.h>
 #include "xrt/xrt_prober.h"
 
+#ifdef XRT_BUILD_HDK
+#include "hdk/hdk_interface.h"
+#endif
+
 #ifdef XRT_BUILD_OHMD
 #include "ohmd/oh_interface.h"
 #endif
 
-#ifdef XRT_BUILD_HDK
-#include "hdk/hdk_interface.h"
+#ifdef XRT_BUILD_PSVR
+#include "psvr/psvr_interface.h"
 #endif
 
 
@@ -34,6 +38,11 @@ static const prober_creator DRIVERS[] = {
     hdk_create_auto_prober,
 #endif
 
+#ifdef XRT_BUILD_PSVR
+    // Returns NULL if none found, so OK to go first.
+    psvr_create_auto_prober,
+#endif
+
 #ifdef XRT_BUILD_OHMD
     oh_create_auto_prober,
 #endif
diff --git a/src/xrt/targets/openxr/CMakeLists.txt b/src/xrt/targets/openxr/CMakeLists.txt
index 64bf5c85c..2fd989170 100644
--- a/src/xrt/targets/openxr/CMakeLists.txt
+++ b/src/xrt/targets/openxr/CMakeLists.txt
@@ -75,14 +75,18 @@ target_link_libraries(${RUNTIME_TARGET}
 	OpenGL::GLX
 	)
 
+if(BUILD_DRIVER_HDK)
+	target_sources(${RUNTIME_TARGET} PRIVATE $<TARGET_OBJECTS:drv_hdk>)
+	target_link_libraries(${RUNTIME_TARGET} PUBLIC ${HIDAPI_LIBRARIES})
+endif()
 
 if(BUILD_DRIVER_OHMD)
 	target_sources(${RUNTIME_TARGET} PRIVATE $<TARGET_OBJECTS:drv_ohmd>)
 	target_link_libraries(${RUNTIME_TARGET} PRIVATE OpenHMD::OpenHMD)
 endif()
 
-if(BUILD_DRIVER_HDK)
-	target_sources(${RUNTIME_TARGET} PRIVATE $<TARGET_OBJECTS:drv_hdk>)
+if(BUILD_DRIVER_PSVR)
+	target_sources(${RUNTIME_TARGET} PRIVATE $<TARGET_OBJECTS:drv_psvr>)
 	target_link_libraries(${RUNTIME_TARGET} PUBLIC ${HIDAPI_LIBRARIES})
 endif()