diff --git a/tools/topology/topology2/cavs-gain-hda.conf b/tools/topology/topology2/cavs-gain-hda.conf
index 385191d34..884f9452a 100644
--- a/tools/topology/topology2/cavs-gain-hda.conf
+++ b/tools/topology/topology2/cavs-gain-hda.conf
@@ -1,25 +1,23 @@
-<include/common/vendor-token.conf>
-<include/common/tokens.conf>
-<include/components/host.conf>
-<include/components/gain.conf>
-<include/components/pipeline.conf>
-<include/pipelines/cavs/gain-playback.conf>
-<include/pipelines/cavs/gain-capture.conf>
-<include/controls/mixer.conf>
-<include/controls/bytes.conf>
-<include/components/copier.conf>
-<include/components/virtual.conf>
-<include/common/data.conf>
-<include/common/pcm.conf>
-<include/common/pcm_caps.conf>
-<include/common/fe_dai.conf>
-<include/dais/hda.conf>
-<include/dais/hw_config.conf>
-<include/common/manifest.conf>
-<include/common/pcm.conf>
-<include/common/fe_dai.conf>
-<include/common/pcm_caps.conf>
-<include/common/route.conf>
+<searchdir:include>
+<searchdir:include/common>
+<searchdir:include/components>
+<searchdir:include/dais>
+<searchdir:include/pipelines/cavs>
+
+<vendor-token.conf>
+<tokens.conf>
+<virtual.conf>
+<gain-playback.conf>
+<gain-capture.conf>
+<data.conf>
+<pcm.conf>
+<pcm_caps.conf>
+<fe_dai.conf>
+<hda.conf>
+<hw_config.conf>
+<manifest.conf>
+<route.conf>
+
 Object.Dai {
 	HDA.0 {
 		name 'Analog Playback and Capture'