diff --git a/src/xrt/targets/cli/meson.build b/src/xrt/targets/cli/meson.build
index 91b0139ad..f99e55e3f 100644
--- a/src/xrt/targets/cli/meson.build
+++ b/src/xrt/targets/cli/meson.build
@@ -8,8 +8,8 @@ cli = executable(
 		'cli_cmd_probe.c',
 		'cli_cmd_test.c',
 		'cli_common.h',
+		'cli_instance.c',
 		'cli_main.c',
-		'cli_prober.c',
 	),
 	link_whole: [
 		lib_aux_os,
diff --git a/src/xrt/targets/common/CMakeLists.txt b/src/xrt/targets/common/CMakeLists.txt
index 8c522808a..a6fbb59b0 100644
--- a/src/xrt/targets/common/CMakeLists.txt
+++ b/src/xrt/targets/common/CMakeLists.txt
@@ -82,6 +82,8 @@ add_library(target_instance STATIC
 target_link_libraries(target_instance PRIVATE
 	xrt-interfaces
 	aux_util
+	st_prober
+	target_lists
 	)
 target_include_directories(target_instance PRIVATE
 	${CMAKE_CURRENT_SOURCE_DIR}/../../drivers
diff --git a/src/xrt/targets/common/meson.build b/src/xrt/targets/common/meson.build
index 8c40516b4..49839b260 100644
--- a/src/xrt/targets/common/meson.build
+++ b/src/xrt/targets/common/meson.build
@@ -18,5 +18,6 @@ lib_target_instance = static_library(
 		'target_instance.c',
 	),
 	include_directories: [xrt_include],
+	link_with: [lib_target_lists, lib_st_prober],
 	dependencies: [aux],
 )
diff --git a/src/xrt/targets/common/target_instance.c b/src/xrt/targets/common/target_instance.c
index a73dbaac2..4d4e1c0a1 100644
--- a/src/xrt/targets/common/target_instance.c
+++ b/src/xrt/targets/common/target_instance.c
@@ -6,6 +6,8 @@
  * @author Jakob Bornecrantz <jakob@collabora.com>
  */
 
+#include "target_lists.h"
+
 #include "xrt/xrt_prober.h"
 #include "xrt/xrt_instance.h"
 #include "xrt/xrt_gfx_fd.h"
@@ -102,7 +104,7 @@ xrt_instance_create(struct xrt_instance **out_xinst)
 {
 	struct xrt_prober *xp = NULL;
 
-	int ret = xrt_prober_create(&xp);
+	int ret = xrt_prober_create_with_lists(&xp, &target_lists);
 	if (ret < 0) {
 		return ret;
 	}