diff --git a/Kbuild b/Kbuild
index 7104ec71ab26..4e639d7938b1 100755
--- a/Kbuild
+++ b/Kbuild
@@ -631,17 +631,21 @@ BMI_OBJS += $(BMI_DIR)/src/bmi_2.o
 else
 BMI_OBJS += $(BMI_DIR)/src/bmi_1.o
 endif
+
 ########### WMI ###########
-WMI_SRC_DIR := qca-wifi-host-cmn//wmi/src
-WMI_INC_DIR := qca-wifi-host-cmn//wmi/inc \
+WMI_ROOT_DIR := wmi
 
-WMI_INC := -I$(WLAN_ROOT)/$(WMI_INC_DIR)
+WMI_SRC_DIR := $(WMI_ROOT_DIR)/src
+WMI_INC_DIR := $(WMI_ROOT_DIR)/inc
+WMI_OBJ_DIR := $(WLAN_COMMON_ROOT)/$(WMI_SRC_DIR)
 
-WMI_OBJS := $(WMI_SRC_DIR)/wmi_unified.o \
-	    $(WMI_SRC_DIR)/wmi_tlv_helper.o \
-            $(WMI_SRC_DIR)/wmi_unified_tlv.o \
-	    $(WMI_SRC_DIR)/wmi_unified_api.o \
-            $(WMI_SRC_DIR)/wmi_unified_non_tlv.o
+WMI_INC := -I$(WLAN_COMMON_INC)/$(WMI_INC_DIR)
+
+WMI_OBJS := $(WMI_OBJ_DIR)/wmi_unified.o \
+	    $(WMI_OBJ_DIR)/wmi_tlv_helper.o \
+	    $(WMI_OBJ_DIR)/wmi_unified_tlv.o \
+	    $(WMI_OBJ_DIR)/wmi_unified_api.o \
+	    $(WMI_OBJ_DIR)/wmi_unified_non_tlv.o
 
 ########### FWLOG ###########
 FWLOG_DIR := core/utils/fwlog