File patches.firefly.wireless-drivers-compile-fix of Package kernel-firefly-itx-3588j

diff --git a/drivers/net/wireless/rockchip_wlan/cywdhd/bcmdhd/Makefile b/drivers/net/wireless/rockchip_wlan/cywdhd/bcmdhd/Makefile
index 9f7cfea98a54..8886f3d1aa7e 100644
--- a/drivers/net/wireless/rockchip_wlan/cywdhd/bcmdhd/Makefile
+++ b/drivers/net/wireless/rockchip_wlan/cywdhd/bcmdhd/Makefile
@@ -588,7 +588,7 @@ ifneq ($(CONFIG_QT),y)
 endif
 EXTRA_CFLAGS += $(DHDCFLAGS) -DDHD_DEBUG
 EXTRA_CFLAGS += -DSRCBASE=\"$(src)\"
-EXTRA_CFLAGS += -I$(src)/include/ -I$(src)/
+EXTRA_CFLAGS += -I$(srctree)/$(src)/include I$(srctree)/$(src)/
 KBUILD_CFLAGS += -I$(KDIR)/include -I$(CURDIR)
 
 bcmdhd-objs := $(DHDOFILES)
diff --git a/drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/Makefile b/drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/Makefile
index 7179479e53a8..33775ca32abf 100644
--- a/drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/Makefile
+++ b/drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/Makefile
@@ -573,7 +573,7 @@ ifneq ($(CONFIG_QT),y)
 endif
 EXTRA_CFLAGS += $(DHDCFLAGS) -DDHD_DEBUG
 EXTRA_CFLAGS += -DSRCBASE=\"$(src)\"
-EXTRA_CFLAGS += -I$(src)/include/ -I$(src)/
+EXTRA_CFLAGS += -I$(srctree)/$(src)/include/ -I$(srctree)/$(src)/
 KBUILD_CFLAGS += -I$(KDIR)/include -I$(CURDIR)
 
 bcmdhd-objs := $(DHDOFILES)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/Makefile b/drivers/net/wireless/rockchip_wlan/rtl8188eu/Makefile
index d382759017bf..253eae33f9dd 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/Makefile
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/Makefile
@@ -21,7 +21,7 @@ ifeq ($(GCC_VER_49),1)
 EXTRA_CFLAGS += -Wno-date-time	# Fix compile error && warning on gcc 4.9 and later
 endif
 
-EXTRA_CFLAGS += -I$(src)/include
+EXTRA_CFLAGS += -I$(srctree)/$(src)/include
 
 EXTRA_LDFLAGS += --strip-debug
 
@@ -243,10 +243,10 @@ _HAL_INTFS_FILES :=	hal/hal_intf.o \
 			hal/led/hal_$(HCI_NAME)_led.o
 
 
-EXTRA_CFLAGS += -I$(src)/platform
+EXTRA_CFLAGS += -I$(srctree)/$(src)/platform
 _PLATFORM_FILES := platform/platform_ops.o
 
-EXTRA_CFLAGS += -I$(src)/hal/btc
+EXTRA_CFLAGS += -I$(srctree)/$(src)/hal/btc
 
 ########### HAL_RTL8188E #################################
 ifeq ($(CONFIG_RTL8188E), y)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_ap.c b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_ap.c
index 0b5a7caedb4c..c791f912f724 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_ap.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_ap.c
@@ -15,7 +15,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #ifndef index_mapping_NUM_88E
 	#define	index_mapping_NUM_88E	15
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_ap.h b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_ap.h
index 5d2bd68325c5..13d8867ed911 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_ap.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_ap.h
@@ -17,8 +17,8 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_powertracking_ap.h"
-#include "halrf/halrf_kfree.h"
+#include "halrf_powertracking_ap.h"
+#include "halrf_kfree.h"
 
 #if (RTL8814A_SUPPORT == 1)
 	#include "halrf/rtl8814a/halrf_iqk_8814a.h"
@@ -29,7 +29,7 @@
 #endif
 
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_ce.c b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_ce.c
index 847dc4d1fbb6..547b0d376273 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_ce.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_ce.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal)\
 	do {                                                                   \
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_ce.h b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_ce.h
index da8b0923e3e9..9bcba88da699 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_ce.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_ce.h
@@ -27,7 +27,7 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_kfree.h"
+#include "halrf_kfree.h"
 #if (RTL8814A_SUPPORT == 1)
 #include "halrf/rtl8814a/halrf_iqk_8814a.h"
 #endif
@@ -37,7 +37,7 @@
 #endif
 
 #if (RTL8821C_SUPPORT == 1)
-#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
@@ -52,7 +52,7 @@
 	#include "halrf/rtl8814b/halrf_dpk_8814b.h"
 #endif
 
-#include "halrf/halrf_powertracking_ce.h"
+#include "halrf_powertracking_ce.h"
 
 enum spur_cal_method {
 	PLL_RESET,
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_iot.c b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_iot.c
index 171553a34681..9698f8ef675f 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_iot.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_iot.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define	CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal) \
 	do {\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_iot.h b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_iot.h
index ed573a00d3cd..534c29c367e6 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_iot.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_iot.h
@@ -27,10 +27,10 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_kfree.h"
+#include "halrf_kfree.h"
 
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
@@ -40,7 +40,7 @@
 	#include "halrf/rtl8195b/halrf_dpk_8195b.h"
 #endif
 
-#include "halrf/halrf_powertracking_iot.h"
+#include "halrf_powertracking_iot.h"
 
 
 enum spur_cal_method {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_win.c b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_win.c
index 9b5969f02211..517ea2a4df39 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_win.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_win.c
@@ -15,7 +15,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define	CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal) \
 	do {\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_win.h b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_win.h
index e085e41889d2..b4af6166c47f 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_win.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halphyrf_win.h
@@ -25,11 +25,11 @@
 	#include "halrf/rtl8822b/halrf_iqk_8822b.h"
 	#include "../mac/Halmac_type.h"
 #endif
-#include "halrf/halrf_powertracking_win.h"
-#include "halrf/halrf_kfree.h"
-#include "halrf/halrf_txgapcal.h"
+#include "halrf_powertracking_win.h"
+#include "halrf_kfree.h"
+#include "halrf_txgapcal.h"
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf.c b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf.c
index 133cd22b66fd..5649270c7afd 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf.c
@@ -30,7 +30,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (RTL8822B_SUPPORT == 1 || RTL8821C_SUPPORT == 1 ||\
 	RTL8195B_SUPPORT == 1 || RTL8198F_SUPPORT == 1 ||\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf.h b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf.h
index 56dd503ec796..3a2eed140e07 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf.h
@@ -30,7 +30,7 @@
 /*@============================================================*/
 /*@include files*/
 /*@============================================================*/
-#include "halrf/halrf_psd.h"
+#include "halrf_psd.h"
 #if (RTL8822B_SUPPORT == 1)
 #include "halrf/rtl8822b/halrf_rfk_init_8822b.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_debug.c b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_debug.c
index 4e258ba87431..13b54fe3124d 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_debug.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_debug.c
@@ -30,7 +30,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 void halrf_basic_profile(void *dm_void, u32 *_used, char *output, u32 *_out_len)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_kfree.c b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_kfree.c
index bd819a562cc1..e8db097749fd 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_kfree.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_kfree.c
@@ -28,7 +28,7 @@
 /*@include files*/
 /*@============================================================*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /*@<YuChen, 150720> Add for KFree Feature Requested by RF David.*/
 /*@This is a phydm API*/
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_powertracking.c b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_powertracking.c
index cadbeb8de7ef..88da9920cf03 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_powertracking.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_powertracking.c
@@ -29,7 +29,7 @@
  * ************************************************************
  */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 boolean
 odm_check_power_status(void *dm_void)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_powertracking_ap.c b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_powertracking_ap.c
index 6838ddcdf7e6..0a31e733dc76 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_powertracking_ap.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_powertracking_ap.c
@@ -18,7 +18,7 @@
  * include files
  * ************************************************************ */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if !defined(_OUTSRC_COEXIST)
 /* ************************************************************
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_powertracking_ce.c b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_powertracking_ce.c
index cf8563888bc5..00813ab66c1b 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_powertracking_ce.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_powertracking_ce.c
@@ -30,7 +30,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /*@************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_powertracking_iot.c b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_powertracking_iot.c
index ddbd93e24208..6c043c4f8b56 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_powertracking_iot.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_powertracking_iot.c
@@ -28,7 +28,7 @@
 /* include files												*/
 /*============================================================	*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /* ************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_powertracking_win.c b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_powertracking_win.c
index 516132bffd33..253594ddf1b7 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_powertracking_win.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_powertracking_win.c
@@ -18,7 +18,7 @@
 /* include files												*/
 /*============================================================	*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /* ************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_psd.c b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_psd.c
index 5258960b163b..b607162c7b77 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_psd.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_psd.c
@@ -19,7 +19,7 @@
  *============================================================
  */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 u64 _sqrt(u64 x)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_txgapcal.c b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_txgapcal.c
index 45aec82a4ebe..f5e6b5559369 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_txgapcal.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/halrf_txgapcal.c
@@ -24,7 +24,7 @@
  *
  *****************************************************************************/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 void odm_bub_sort(u32 *data, u32 n)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/rtl8188e/halrf_8188e_win.c b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/rtl8188e/halrf_8188e_win.c
index d99cc80e41a3..d0dd33fabc9e 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/rtl8188e/halrf_8188e_win.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/halrf/rtl8188e/halrf_8188e_win.c
@@ -17,7 +17,7 @@
 #include "mp_precomp.h"
 
 #if RT_PLATFORM==PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/txbf/haltxbf8822b.c b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/txbf/haltxbf8822b.c
index 1924e0f15a6c..153ea3e2d7a1 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/txbf/haltxbf8822b.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/txbf/haltxbf8822b.c
@@ -21,7 +21,7 @@
 /*@============================================================*/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (RTL8822B_SUPPORT == 1)
 #ifdef PHYDM_BEAMFORMING_SUPPORT
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/txbf/phydm_hal_txbf_api.c b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/txbf/phydm_hal_txbf_api.c
index 479ede5f3ebf..fd3121ddc2f9 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/txbf/phydm_hal_txbf_api.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188eu/hal/phydm/txbf/phydm_hal_txbf_api.c
@@ -15,7 +15,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (defined(CONFIG_BB_TXBF_API))
 #if (RTL8822B_SUPPORT == 1 || RTL8192F_SUPPORT == 1 ||\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/Makefile b/drivers/net/wireless/rockchip_wlan/rtl8188fu/Makefile
index ba3f39dd2b8b..4c44978bc38f 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/Makefile
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/Makefile
@@ -21,7 +21,7 @@ ifeq ($(GCC_VER_49),1)
 EXTRA_CFLAGS += -Wno-date-time	# Fix compile error && warning on gcc 4.9 and later
 endif
 
-EXTRA_CFLAGS += -I$(src)/include
+EXTRA_CFLAGS += -I$(srctree)/$(src)/include
 
 EXTRA_LDFLAGS += --strip-debug
 
@@ -243,10 +243,10 @@ _HAL_INTFS_FILES :=	hal/hal_intf.o \
 			hal/led/hal_$(HCI_NAME)_led.o
 
 
-EXTRA_CFLAGS += -I$(src)/platform
+EXTRA_CFLAGS += -I$(srctree)/$(src)/platform
 _PLATFORM_FILES := platform/platform_ops.o
 
-EXTRA_CFLAGS += -I$(src)/hal/btc
+EXTRA_CFLAGS += -I$(srctree)/$(src)/hal/btc
 
 ########### HAL_RTL8188E #################################
 ifeq ($(CONFIG_RTL8188E), y)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_ap.c b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_ap.c
index 0b5a7caedb4c..c791f912f724 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_ap.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_ap.c
@@ -15,7 +15,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #ifndef index_mapping_NUM_88E
 	#define	index_mapping_NUM_88E	15
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_ap.h b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_ap.h
index 5d2bd68325c5..13d8867ed911 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_ap.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_ap.h
@@ -17,8 +17,8 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_powertracking_ap.h"
-#include "halrf/halrf_kfree.h"
+#include "halrf_powertracking_ap.h"
+#include "halrf_kfree.h"
 
 #if (RTL8814A_SUPPORT == 1)
 	#include "halrf/rtl8814a/halrf_iqk_8814a.h"
@@ -29,7 +29,7 @@
 #endif
 
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_ce.c b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_ce.c
index 847dc4d1fbb6..547b0d376273 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_ce.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_ce.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal)\
 	do {                                                                   \
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_ce.h b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_ce.h
index da8b0923e3e9..9bcba88da699 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_ce.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_ce.h
@@ -27,7 +27,7 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_kfree.h"
+#include "halrf_kfree.h"
 #if (RTL8814A_SUPPORT == 1)
 #include "halrf/rtl8814a/halrf_iqk_8814a.h"
 #endif
@@ -37,7 +37,7 @@
 #endif
 
 #if (RTL8821C_SUPPORT == 1)
-#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
@@ -52,7 +52,7 @@
 	#include "halrf/rtl8814b/halrf_dpk_8814b.h"
 #endif
 
-#include "halrf/halrf_powertracking_ce.h"
+#include "halrf_powertracking_ce.h"
 
 enum spur_cal_method {
 	PLL_RESET,
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_iot.c b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_iot.c
index 171553a34681..9698f8ef675f 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_iot.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_iot.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define	CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal) \
 	do {\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_iot.h b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_iot.h
index ed573a00d3cd..534c29c367e6 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_iot.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_iot.h
@@ -27,10 +27,10 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_kfree.h"
+#include "halrf_kfree.h"
 
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
@@ -40,7 +40,7 @@
 	#include "halrf/rtl8195b/halrf_dpk_8195b.h"
 #endif
 
-#include "halrf/halrf_powertracking_iot.h"
+#include "halrf_powertracking_iot.h"
 
 
 enum spur_cal_method {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_win.c b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_win.c
index 9b5969f02211..517ea2a4df39 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_win.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_win.c
@@ -15,7 +15,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define	CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal) \
 	do {\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_win.h b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_win.h
index e085e41889d2..b4af6166c47f 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_win.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halphyrf_win.h
@@ -25,11 +25,11 @@
 	#include "halrf/rtl8822b/halrf_iqk_8822b.h"
 	#include "../mac/Halmac_type.h"
 #endif
-#include "halrf/halrf_powertracking_win.h"
-#include "halrf/halrf_kfree.h"
-#include "halrf/halrf_txgapcal.h"
+#include "halrf_powertracking_win.h"
+#include "halrf_kfree.h"
+#include "halrf_txgapcal.h"
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf.c b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf.c
index a917b3c6990e..78bca7df6707 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf.c
@@ -30,7 +30,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (RTL8822B_SUPPORT == 1 || RTL8821C_SUPPORT == 1 ||\
 	RTL8195B_SUPPORT == 1 || RTL8198F_SUPPORT == 1 ||\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf.h b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf.h
index c86c9a630fc7..2647bef9cb73 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf.h
@@ -30,7 +30,7 @@
 /*@============================================================*/
 /*@include files*/
 /*@============================================================*/
-#include "halrf/halrf_psd.h"
+#include "halrf_psd.h"
 #if (RTL8822B_SUPPORT == 1)
 #include "halrf/rtl8822b/halrf_rfk_init_8822b.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_debug.c b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_debug.c
index 4e258ba87431..13b54fe3124d 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_debug.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_debug.c
@@ -30,7 +30,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 void halrf_basic_profile(void *dm_void, u32 *_used, char *output, u32 *_out_len)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_kfree.c b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_kfree.c
index bd819a562cc1..e8db097749fd 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_kfree.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_kfree.c
@@ -28,7 +28,7 @@
 /*@include files*/
 /*@============================================================*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /*@<YuChen, 150720> Add for KFree Feature Requested by RF David.*/
 /*@This is a phydm API*/
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_powertracking.c b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_powertracking.c
index cadbeb8de7ef..88da9920cf03 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_powertracking.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_powertracking.c
@@ -29,7 +29,7 @@
  * ************************************************************
  */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 boolean
 odm_check_power_status(void *dm_void)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_powertracking_ap.c b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_powertracking_ap.c
index 6838ddcdf7e6..0a31e733dc76 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_powertracking_ap.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_powertracking_ap.c
@@ -18,7 +18,7 @@
  * include files
  * ************************************************************ */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if !defined(_OUTSRC_COEXIST)
 /* ************************************************************
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_powertracking_ce.c b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_powertracking_ce.c
index cf8563888bc5..00813ab66c1b 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_powertracking_ce.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_powertracking_ce.c
@@ -30,7 +30,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /*@************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_powertracking_iot.c b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_powertracking_iot.c
index ddbd93e24208..6c043c4f8b56 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_powertracking_iot.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_powertracking_iot.c
@@ -28,7 +28,7 @@
 /* include files												*/
 /*============================================================	*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /* ************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_powertracking_win.c b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_powertracking_win.c
index 516132bffd33..253594ddf1b7 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_powertracking_win.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_powertracking_win.c
@@ -18,7 +18,7 @@
 /* include files												*/
 /*============================================================	*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /* ************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_psd.c b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_psd.c
index 5258960b163b..b607162c7b77 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_psd.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_psd.c
@@ -19,7 +19,7 @@
  *============================================================
  */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 u64 _sqrt(u64 x)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_txgapcal.c b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_txgapcal.c
index 45aec82a4ebe..f5e6b5559369 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_txgapcal.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/halrf_txgapcal.c
@@ -24,7 +24,7 @@
  *
  *****************************************************************************/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 void odm_bub_sort(u32 *data, u32 n)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/rtl8188f/halrf_8188f.c b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/rtl8188f/halrf_8188f.c
index ff2b79dc4b86..4d3cfcd0a074 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/rtl8188f/halrf_8188f.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/halrf/rtl8188f/halrf_8188f.c
@@ -18,7 +18,7 @@
 /*#if (DM_ODM_SUPPORT_TYPE == ODM_WIN)*/
 #if (DM_ODM_SUPPORT_TYPE == 0x08) /*[PHYDM-262] workaround for SD4 compile warning*/
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/txbf/haltxbf8822b.c b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/txbf/haltxbf8822b.c
index 1924e0f15a6c..153ea3e2d7a1 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/txbf/haltxbf8822b.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/txbf/haltxbf8822b.c
@@ -21,7 +21,7 @@
 /*@============================================================*/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (RTL8822B_SUPPORT == 1)
 #ifdef PHYDM_BEAMFORMING_SUPPORT
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/txbf/phydm_hal_txbf_api.c b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/txbf/phydm_hal_txbf_api.c
index 479ede5f3ebf..fd3121ddc2f9 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/txbf/phydm_hal_txbf_api.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8188fu/hal/phydm/txbf/phydm_hal_txbf_api.c
@@ -15,7 +15,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (defined(CONFIG_BB_TXBF_API))
 #if (RTL8822B_SUPPORT == 1 || RTL8192F_SUPPORT == 1 ||\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189es/Makefile b/drivers/net/wireless/rockchip_wlan/rtl8189es/Makefile
index 6c71051d7af2..554c452a9f80 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189es/Makefile
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189es/Makefile
@@ -21,7 +21,7 @@ ifeq ($(GCC_VER_49),1)
 EXTRA_CFLAGS += -Wno-date-time	# Fix compile error && warning on gcc 4.9 and later
 endif
 
-EXTRA_CFLAGS += -I$(src)/include
+EXTRA_CFLAGS += -I$(srctree)/$(src)/include
 
 EXTRA_LDFLAGS += --strip-debug
 
@@ -214,11 +214,11 @@ _OUTSRC_FILES := hal/phydm/phydm_debug.o	\
 		hal/phydm/phydm_noisemonitor.o\
 		hal/phydm/phydm_acs.o
 
-EXTRA_CFLAGS += -I$(src)/platform
+EXTRA_CFLAGS += -I$(srctree)/$(src)/platform
 _PLATFORM_FILES := platform/platform_ops.o
 
 ifeq ($(CONFIG_BT_COEXIST), y)
-EXTRA_CFLAGS += -I$(src)/hal/btc
+EXTRA_CFLAGS += -I$(srctree)/$(src)/hal/btc
 _OUTSRC_FILES += hal/btc/HalBtc8192e1Ant.o \
 				hal/btc/HalBtc8192e2Ant.o \
 				hal/btc/HalBtc8723b1Ant.o \
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/Makefile b/drivers/net/wireless/rockchip_wlan/rtl8189fs/Makefile
index 53c17d329f7c..8f3bbde4e405 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/Makefile
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/Makefile
@@ -21,7 +21,7 @@ ifeq ($(GCC_VER_49),1)
 EXTRA_CFLAGS += -Wno-date-time	# Fix compile error && warning on gcc 4.9 and later
 endif
 
-EXTRA_CFLAGS += -I$(src)/include
+EXTRA_CFLAGS += -I$(srctree)/$(src)/include
 
 EXTRA_LDFLAGS += --strip-debug
 
@@ -247,10 +247,10 @@ _HAL_INTFS_FILES :=	hal/hal_intf.o \
 			hal/led/hal_$(HCI_NAME)_led.o
 
 
-EXTRA_CFLAGS += -I$(src)/platform
+EXTRA_CFLAGS += -I$(srctree)/$(src)/platform
 _PLATFORM_FILES := platform/platform_ops.o
 
-EXTRA_CFLAGS += -I$(src)/hal/btc
+EXTRA_CFLAGS += -I$(srctree)/$(src)/hal/btc
 
 ########### HAL_RTL8188E #################################
 ifeq ($(CONFIG_RTL8188E), y)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_ap.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_ap.c
index 0b5a7caedb4c..c791f912f724 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_ap.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_ap.c
@@ -15,7 +15,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #ifndef index_mapping_NUM_88E
 	#define	index_mapping_NUM_88E	15
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_ap.h b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_ap.h
index 5d2bd68325c5..13d8867ed911 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_ap.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_ap.h
@@ -17,8 +17,8 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_powertracking_ap.h"
-#include "halrf/halrf_kfree.h"
+#include "halrf_powertracking_ap.h"
+#include "halrf_kfree.h"
 
 #if (RTL8814A_SUPPORT == 1)
 	#include "halrf/rtl8814a/halrf_iqk_8814a.h"
@@ -29,7 +29,7 @@
 #endif
 
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_ce.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_ce.c
index 4225cf0d4962..602aedca7a6d 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_ce.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_ce.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal)\
 	do {                                                                   \
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_ce.h b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_ce.h
index da8b0923e3e9..9bcba88da699 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_ce.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_ce.h
@@ -27,7 +27,7 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_kfree.h"
+#include "halrf_kfree.h"
 #if (RTL8814A_SUPPORT == 1)
 #include "halrf/rtl8814a/halrf_iqk_8814a.h"
 #endif
@@ -37,7 +37,7 @@
 #endif
 
 #if (RTL8821C_SUPPORT == 1)
-#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
@@ -52,7 +52,7 @@
 	#include "halrf/rtl8814b/halrf_dpk_8814b.h"
 #endif
 
-#include "halrf/halrf_powertracking_ce.h"
+#include "halrf_powertracking_ce.h"
 
 enum spur_cal_method {
 	PLL_RESET,
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_iot.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_iot.c
index 171553a34681..9698f8ef675f 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_iot.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_iot.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define	CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal) \
 	do {\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_iot.h b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_iot.h
index ed573a00d3cd..534c29c367e6 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_iot.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_iot.h
@@ -27,10 +27,10 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_kfree.h"
+#include "halrf_kfree.h"
 
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
@@ -40,7 +40,7 @@
 	#include "halrf/rtl8195b/halrf_dpk_8195b.h"
 #endif
 
-#include "halrf/halrf_powertracking_iot.h"
+#include "halrf_powertracking_iot.h"
 
 
 enum spur_cal_method {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_win.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_win.c
index 9b5969f02211..517ea2a4df39 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_win.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_win.c
@@ -15,7 +15,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define	CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal) \
 	do {\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_win.h b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_win.h
index e085e41889d2..b4af6166c47f 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_win.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halphyrf_win.h
@@ -25,11 +25,11 @@
 	#include "halrf/rtl8822b/halrf_iqk_8822b.h"
 	#include "../mac/Halmac_type.h"
 #endif
-#include "halrf/halrf_powertracking_win.h"
-#include "halrf/halrf_kfree.h"
-#include "halrf/halrf_txgapcal.h"
+#include "halrf_powertracking_win.h"
+#include "halrf_kfree.h"
+#include "halrf_txgapcal.h"
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf.c
index 990fbadf2a08..83338dcaca27 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf.c
@@ -30,7 +30,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (RTL8822B_SUPPORT == 1 || RTL8821C_SUPPORT == 1 ||\
 	RTL8195B_SUPPORT == 1 || RTL8198F_SUPPORT == 1 ||\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf.h b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf.h
index 009bd9b0f5ce..86de7a689946 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf.h
@@ -30,7 +30,7 @@
 /*@============================================================*/
 /*@include files*/
 /*@============================================================*/
-#include "halrf/halrf_psd.h"
+#include "halrf_psd.h"
 #if (RTL8822B_SUPPORT == 1)
 #include "halrf/rtl8822b/halrf_rfk_init_8822b.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_debug.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_debug.c
index 4e258ba87431..13b54fe3124d 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_debug.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_debug.c
@@ -30,7 +30,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 void halrf_basic_profile(void *dm_void, u32 *_used, char *output, u32 *_out_len)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_kfree.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_kfree.c
index bd819a562cc1..e8db097749fd 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_kfree.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_kfree.c
@@ -28,7 +28,7 @@
 /*@include files*/
 /*@============================================================*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /*@<YuChen, 150720> Add for KFree Feature Requested by RF David.*/
 /*@This is a phydm API*/
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_powertracking.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_powertracking.c
index cadbeb8de7ef..88da9920cf03 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_powertracking.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_powertracking.c
@@ -29,7 +29,7 @@
  * ************************************************************
  */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 boolean
 odm_check_power_status(void *dm_void)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_powertracking_ap.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_powertracking_ap.c
index 6838ddcdf7e6..0a31e733dc76 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_powertracking_ap.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_powertracking_ap.c
@@ -18,7 +18,7 @@
  * include files
  * ************************************************************ */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if !defined(_OUTSRC_COEXIST)
 /* ************************************************************
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_powertracking_ce.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_powertracking_ce.c
index cf8563888bc5..00813ab66c1b 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_powertracking_ce.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_powertracking_ce.c
@@ -30,7 +30,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /*@************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_powertracking_iot.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_powertracking_iot.c
index ddbd93e24208..6c043c4f8b56 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_powertracking_iot.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_powertracking_iot.c
@@ -28,7 +28,7 @@
 /* include files												*/
 /*============================================================	*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /* ************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_powertracking_win.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_powertracking_win.c
index 516132bffd33..253594ddf1b7 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_powertracking_win.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_powertracking_win.c
@@ -18,7 +18,7 @@
 /* include files												*/
 /*============================================================	*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /* ************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_psd.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_psd.c
index 5258960b163b..b607162c7b77 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_psd.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_psd.c
@@ -19,7 +19,7 @@
  *============================================================
  */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 u64 _sqrt(u64 x)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_txgapcal.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_txgapcal.c
index 45aec82a4ebe..f5e6b5559369 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_txgapcal.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/halrf_txgapcal.c
@@ -24,7 +24,7 @@
  *
  *****************************************************************************/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 void odm_bub_sort(u32 *data, u32 n)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/rtl8188f/halrf_8188f.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/rtl8188f/halrf_8188f.c
index ff2b79dc4b86..4d3cfcd0a074 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/rtl8188f/halrf_8188f.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/halrf/rtl8188f/halrf_8188f.c
@@ -18,7 +18,7 @@
 /*#if (DM_ODM_SUPPORT_TYPE == ODM_WIN)*/
 #if (DM_ODM_SUPPORT_TYPE == 0x08) /*[PHYDM-262] workaround for SD4 compile warning*/
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/txbf/haltxbf8822b.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/txbf/haltxbf8822b.c
index 1924e0f15a6c..153ea3e2d7a1 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/txbf/haltxbf8822b.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/txbf/haltxbf8822b.c
@@ -21,7 +21,7 @@
 /*@============================================================*/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (RTL8822B_SUPPORT == 1)
 #ifdef PHYDM_BEAMFORMING_SUPPORT
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/txbf/phydm_hal_txbf_api.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/txbf/phydm_hal_txbf_api.c
index 479ede5f3ebf..fd3121ddc2f9 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/txbf/phydm_hal_txbf_api.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/phydm/txbf/phydm_hal_txbf_api.c
@@ -15,7 +15,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (defined(CONFIG_BB_TXBF_API))
 #if (RTL8822B_SUPPORT == 1 || RTL8192F_SUPPORT == 1 ||\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/Makefile b/drivers/net/wireless/rockchip_wlan/rtl8723bs/Makefile
index fe9d5638a128..b7c131ea7cbd 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/Makefile
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/Makefile
@@ -21,7 +21,7 @@ ifeq ($(GCC_VER_49),1)
 EXTRA_CFLAGS += -Wno-date-time	# Fix compile error && warning on gcc 4.9 and later
 endif
 
-EXTRA_CFLAGS += -I$(src)/include
+EXTRA_CFLAGS += -I$(srctree)/$(src)/include
 
 EXTRA_LDFLAGS += --strip-debug
 
@@ -216,10 +216,10 @@ _HAL_INTFS_FILES :=	hal/hal_intf.o \
 			hal/led/hal_$(HCI_NAME)_led.o
 
 
-EXTRA_CFLAGS += -I$(src)/platform
+EXTRA_CFLAGS += -I$(srctree)/$(src)/platform
 _PLATFORM_FILES := platform/platform_ops.o
 
-EXTRA_CFLAGS += -I$(src)/hal/btc
+EXTRA_CFLAGS += -I$(srctree)/$(src)/hal/btc
 _BTC_FILES += hal/btc/halbtc8723bwifionly.o \
 				hal/btc/halbtc8822bwifionly.o \
 				hal/btc/halbtc8821cwifionly.o
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_ap.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_ap.c
index 44fc908c858d..95e2e5a11cc9 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_ap.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_ap.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #ifndef index_mapping_NUM_88E
 	#define	index_mapping_NUM_88E	15
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_ap.h b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_ap.h
index ee34c2125d40..d95ef23daca3 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_ap.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_ap.h
@@ -16,8 +16,8 @@
 #ifndef __HAL_PHY_RF_H__
 #define __HAL_PHY_RF_H__
 
-#include "halrf/halrf_powertracking_ap.h"
-#include "halrf/halrf_kfree.h"
+#include "halrf_powertracking_ap.h"
+#include "halrf_kfree.h"
 
 #if (RTL8814A_SUPPORT == 1)
 	#include "halrf/rtl8814a/halrf_iqk_8814a.h"
@@ -28,7 +28,7 @@
 #endif
 
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 enum pwrtrack_method {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_ce.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_ce.c
index f9c031fdc791..b28d7a87043f 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_ce.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_ce.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define	CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal) \
 	do {\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_ce.h b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_ce.h
index f2afd2804147..dad26252caa2 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_ce.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_ce.h
@@ -16,7 +16,7 @@
 #ifndef __HAL_PHY_RF_H__
 #define __HAL_PHY_RF_H__
 
-#include "halrf/halrf_kfree.h"
+#include "halrf_kfree.h"
 #if (RTL8814A_SUPPORT == 1)
 	#include "halrf/rtl8814a/halrf_iqk_8814a.h"
 #endif
@@ -26,10 +26,10 @@
 #endif
 
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
-#include "halrf/halrf_powertracking_ce.h"
+#include "halrf_powertracking_ce.h"
 
 
 enum spur_cal_method {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_win.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_win.c
index d5d0b402cdbe..b64d1cace498 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_win.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_win.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define	CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal) \
 	do {\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_win.h b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_win.h
index bb6f2555a481..a4ea997bd2b7 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_win.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halphyrf_win.h
@@ -24,11 +24,11 @@
 	#include "halrf/rtl8822b/halrf_iqk_8822b.h"
 	#include "../mac/Halmac_type.h"
 #endif
-#include "halrf/halrf_powertracking_win.h"
-#include "halrf/halrf_kfree.h"
-#include "halrf/halrf_txgapcal.h"
+#include "halrf_powertracking_win.h"
+#include "halrf_kfree.h"
+#include "halrf_txgapcal.h"
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 enum spur_cal_method {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf.c
index fde97eca4480..4f463ed988d8 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf.c
@@ -18,7 +18,7 @@
  * ************************************************************ */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 void halrf_basic_profile(
 	void			*p_dm_void,
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_kfree.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_kfree.c
index fd579ce79583..65b742cbaf56 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_kfree.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_kfree.c
@@ -17,7 +17,7 @@
 /*include files*/
 /*============================================================*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 
 /*<YuChen, 150720> Add for KFree Feature Requested by RF David.*/
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_powertracking.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_powertracking.c
index dc43998a5f66..ca6a7660feb0 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_powertracking.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_powertracking.c
@@ -17,7 +17,7 @@
  * include files
  * ************************************************************ */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 
 boolean
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_powertracking_ap.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_powertracking_ap.c
index 7319c40ab108..a376e1e84619 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_powertracking_ap.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_powertracking_ap.c
@@ -17,7 +17,7 @@
  * include files
  * ************************************************************ */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if !defined(_OUTSRC_COEXIST)
 /* ************************************************************
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_powertracking_ce.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_powertracking_ce.c
index cb40caf644cc..e76f31398421 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_powertracking_ce.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_powertracking_ce.c
@@ -17,7 +17,7 @@
 /* include files												*/
 /*============================================================	*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /* ************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_powertracking_win.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_powertracking_win.c
index c89d446c790d..47e7b173facd 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_powertracking_win.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_powertracking_win.c
@@ -17,7 +17,7 @@
 /* include files												*/
 /*============================================================	*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /* ************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_txgapcal.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_txgapcal.c
index 3ab8189c496e..648daabb92d7 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_txgapcal.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/halrf_txgapcal.c
@@ -1,5 +1,5 @@
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 
 
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/rtl8723b/halrf_8723b_win.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/rtl8723b/halrf_8723b_win.c
index 072c6f62b066..8c43926c4d93 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/rtl8723b/halrf_8723b_win.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/halrf/rtl8723b/halrf_8723b_win.c
@@ -16,7 +16,7 @@
 #include "mp_precomp.h"
 
 #if RT_PLATFORM==PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/txbf/haltxbf8822b.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/txbf/haltxbf8822b.c
index 5303d1657add..614b959215ff 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/txbf/haltxbf8822b.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/txbf/haltxbf8822b.c
@@ -21,7 +21,7 @@
 /*============================================================*/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (RTL8822B_SUPPORT == 1)
 #if (BEAMFORMING_SUPPORT == 1)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/txbf/phydm_hal_txbf_api.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/txbf/phydm_hal_txbf_api.c
index 8926a4e0069a..f52897138670 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/txbf/phydm_hal_txbf_api.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/phydm/txbf/phydm_hal_txbf_api.c
@@ -15,7 +15,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (defined(CONFIG_BB_TXBF_API))
 #if (RTL8822B_SUPPORT == 1)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bu/Makefile b/drivers/net/wireless/rockchip_wlan/rtl8723bu/Makefile
index 541757cdbc4d..c2218110900b 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bu/Makefile
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bu/Makefile
@@ -17,8 +17,8 @@ EXTRA_CFLAGS += -Wno-unused
 #EXTRA_CFLAGS += -Wno-uninitialized
 #EXTRA_CFLAGS += -Wno-error=date-time	# Fix compile error on gcc 4.9 and later
 
-EXTRA_CFLAGS += -I$(src)/include
-EXTRA_CFLAGS += -I$(src)/hal/phydm
+EXTRA_CFLAGS += -I$(srctree)/$(src)/include
+EXTRA_CFLAGS += -I$(srctree)/$(src)/hal/phydm
 
 EXTRA_LDFLAGS += --strip-debug
 
@@ -214,11 +214,11 @@ _OUTSRC_FILES := hal/phydm/phydm_debug.o	\
 		hal/phydm/txbf/haltxbfinterface.o
 
 
-EXTRA_CFLAGS += -I$(src)/platform
+EXTRA_CFLAGS += -I$(srctree)/$(src)/platform
 _PLATFORM_FILES := platform/platform_ops.o
 
 ifeq ($(CONFIG_BT_COEXIST), y)
-EXTRA_CFLAGS += -I$(src)/hal/btc
+EXTRA_CFLAGS += -I$(srctree)/$(src)/hal/btc
 _OUTSRC_FILES += hal/btc/HalBtc8192e1Ant.o \
 				hal/btc/HalBtc8192e2Ant.o \
 				hal/btc/HalBtc8723b1Ant.o \
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/Makefile b/drivers/net/wireless/rockchip_wlan/rtl8723cs/Makefile
index f6a05d0213a6..f0276dd8f19a 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/Makefile
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/Makefile
@@ -21,7 +21,7 @@ ifeq ($(GCC_VER_49),1)
 EXTRA_CFLAGS += -Wno-date-time	# Fix compile error && warning on gcc 4.9 and later
 endif
 
-EXTRA_CFLAGS += -I$(src)/include
+EXTRA_CFLAGS += -I$(srctree)/$(src)/include
 
 EXTRA_LDFLAGS += --strip-debug
 
@@ -268,10 +268,10 @@ _HAL_INTFS_FILES :=	hal/hal_intf.o \
 			hal/led/hal_$(HCI_NAME)_led.o
 
 
-EXTRA_CFLAGS += -I$(src)/platform
+EXTRA_CFLAGS += -I$(srctree)/$(src)/platform
 _PLATFORM_FILES := platform/platform_ops.o
 
-EXTRA_CFLAGS += -I$(src)/hal/btc
+EXTRA_CFLAGS += -I$(srctree)/$(src)/hal/btc
 
 ########### HAL_RTL8188E #################################
 ifeq ($(CONFIG_RTL8188E), y)
@@ -2405,7 +2405,7 @@ ifeq ($(CONFIG_SDIO_HCI), y)
 rtk_core += core/rtw_sdio.o
 endif
 
-EXTRA_CFLAGS += -I$(src)/core/crypto
+EXTRA_CFLAGS += -I$(srctree)/$(src)/core/crypto
 rtk_core += \
 		core/crypto/aes-internal.o \
 		core/crypto/aes-internal-enc.o \
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_ap.c b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_ap.c
index 857f01946842..a9da13ce8ced 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_ap.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_ap.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #ifndef index_mapping_NUM_88E
 	#define	index_mapping_NUM_88E	15
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_ap.h b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_ap.h
index 8cc2797bc58c..4c114d56dc41 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_ap.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_ap.h
@@ -16,8 +16,8 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_powertracking_ap.h"
-#include "halrf/halrf_kfree.h"
+#include "halrf_powertracking_ap.h"
+#include "halrf_kfree.h"
 
 #if (RTL8814A_SUPPORT == 1)
 	#include "halrf/rtl8814a/halrf_iqk_8814a.h"
@@ -28,7 +28,7 @@
 #endif
 
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_ce.c b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_ce.c
index 1cfb95d36b9c..a043de6b14af 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_ce.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_ce.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal)\
 	do {                                                                   \
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_ce.h b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_ce.h
index dcded1e0acb5..00e8d504c9ec 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_ce.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_ce.h
@@ -26,7 +26,7 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_kfree.h"
+#include "halrf_kfree.h"
 #if (RTL8814A_SUPPORT == 1)
 #include "halrf/rtl8814a/halrf_iqk_8814a.h"
 #endif
@@ -36,7 +36,7 @@
 #endif
 
 #if (RTL8821C_SUPPORT == 1)
-#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
@@ -52,7 +52,7 @@
 	#include "halrf/rtl8814b/halrf_txgapk_8814b.h"
 #endif
 
-#include "halrf/halrf_powertracking_ce.h"
+#include "halrf_powertracking_ce.h"
 
 enum spur_cal_method {
 	PLL_RESET,
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_iot.c b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_iot.c
index 16d9084db881..a6d89316799a 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_iot.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_iot.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define	CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal) \
 	do {\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_iot.h b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_iot.h
index 8d4395a1f74d..0f44ce423f1e 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_iot.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_iot.h
@@ -26,10 +26,10 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_kfree.h"
+#include "halrf_kfree.h"
 
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
@@ -46,7 +46,7 @@
 //	#include "halrf/rtl8710c/halrf_dpk_8710c.h"
 #endif
 
-#include "halrf/halrf_powertracking_iot.h"
+#include "halrf_powertracking_iot.h"
 
 
 enum spur_cal_method {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_win.c b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_win.c
index 679d5e094da0..fcfa26a439c7 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_win.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_win.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define	CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal) \
 	do {\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_win.h b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_win.h
index 3769d60a9126..281f3819100a 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_win.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halphyrf_win.h
@@ -24,11 +24,11 @@
 	#include "halrf/rtl8822b/halrf_iqk_8822b.h"
 	#include "../mac/Halmac_type.h"
 #endif
-#include "halrf/halrf_powertracking_win.h"
-#include "halrf/halrf_kfree.h"
-#include "halrf/halrf_txgapcal.h"
+#include "halrf_powertracking_win.h"
+#include "halrf_kfree.h"
+#include "halrf_txgapcal.h"
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf.c b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf.c
index c1bf2cc1d03b..85bd51daf0d8 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf.c
@@ -29,7 +29,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (RTL8822B_SUPPORT == 1 || RTL8821C_SUPPORT == 1 ||\
 	RTL8195B_SUPPORT == 1 || RTL8198F_SUPPORT == 1 ||\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf.h b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf.h
index 560b1fd10671..6a1171ecd179 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf.h
@@ -29,7 +29,7 @@
 /*@============================================================*/
 /*@include files*/
 /*@============================================================*/
-#include "halrf/halrf_psd.h"
+#include "halrf_psd.h"
 #if (RTL8822B_SUPPORT == 1)
 #include "halrf/rtl8822b/halrf_rfk_init_8822b.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_debug.c b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_debug.c
index 692c6f1fc764..796fd7672a61 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_debug.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_debug.c
@@ -29,7 +29,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 void halrf_basic_profile(void *dm_void, u32 *_used, char *output, u32 *_out_len)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_kfree.c b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_kfree.c
index bb18026466d5..0e7d3949a49d 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_kfree.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_kfree.c
@@ -27,7 +27,7 @@
 /*@include files*/
 /*@============================================================*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /*@<YuChen, 150720> Add for KFree Feature Requested by RF David.*/
 /*@This is a phydm API*/
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_powertracking.c b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_powertracking.c
index a1db18f95e8c..4907a07bba51 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_powertracking.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_powertracking.c
@@ -28,7 +28,7 @@
  * ************************************************************
  */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 boolean
 odm_check_power_status(void *dm_void)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_powertracking_ap.c b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_powertracking_ap.c
index 28a8091fa402..1dfa84899cca 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_powertracking_ap.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_powertracking_ap.c
@@ -17,7 +17,7 @@
  * include files
  * ************************************************************ */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if !defined(_OUTSRC_COEXIST)
 /* ************************************************************
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_powertracking_ce.c b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_powertracking_ce.c
index 6607991766f3..e6633f704c2e 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_powertracking_ce.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_powertracking_ce.c
@@ -29,7 +29,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /*@************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_powertracking_iot.c b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_powertracking_iot.c
index 494fdec37a46..d5ca81805111 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_powertracking_iot.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_powertracking_iot.c
@@ -27,7 +27,7 @@
 /* include files												*/
 /*============================================================	*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /* ************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_powertracking_win.c b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_powertracking_win.c
index 5cb9542574e7..cf7f9e1a15b3 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_powertracking_win.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_powertracking_win.c
@@ -17,7 +17,7 @@
 /* include files												*/
 /*============================================================	*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /* ************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_psd.c b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_psd.c
index bab7d09acd0b..b45702e01450 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_psd.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_psd.c
@@ -18,7 +18,7 @@
  *============================================================
  */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 u64 _sqrt(u64 x)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_txgapcal.c b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_txgapcal.c
index 0cc44974bf3f..2b81c802883a 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_txgapcal.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/halrf_txgapcal.c
@@ -23,7 +23,7 @@
  *
  *****************************************************************************/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 void odm_bub_sort(u32 *data, u32 n)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/rtl8703b/halrf_8703b.c b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/rtl8703b/halrf_8703b.c
index 6630fee689a6..3b935d4de987 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/rtl8703b/halrf_8703b.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/halrf/rtl8703b/halrf_8703b.c
@@ -16,7 +16,7 @@
 #include "mp_precomp.h"
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/txbf/haltxbf8822b.c b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/txbf/haltxbf8822b.c
index a1d35c9b178d..502ec92d6388 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/txbf/haltxbf8822b.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/txbf/haltxbf8822b.c
@@ -20,7 +20,7 @@
 /*@============================================================*/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (RTL8822B_SUPPORT == 1)
 #ifdef PHYDM_BEAMFORMING_SUPPORT
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/txbf/phydm_hal_txbf_api.c b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/txbf/phydm_hal_txbf_api.c
index 33a7e71ff3f8..bcb36ec92ece 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/txbf/phydm_hal_txbf_api.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/phydm/txbf/phydm_hal_txbf_api.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (defined(CONFIG_BB_TXBF_API))
 #if (RTL8822B_SUPPORT == 1 || RTL8192F_SUPPORT == 1 || RTL8812F_SUPPORT == 1 ||\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/Makefile b/drivers/net/wireless/rockchip_wlan/rtl8723ds/Makefile
index 81351c905001..8edd5c8855e9 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/Makefile
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/Makefile
@@ -21,7 +21,7 @@ ifeq ($(GCC_VER_49),1)
 EXTRA_CFLAGS += -Wno-date-time	# Fix compile error && warning on gcc 4.9 and later
 endif
 
-EXTRA_CFLAGS += -I$(src)/include
+EXTRA_CFLAGS += -I$(srctree)/$(src)/include
 
 EXTRA_LDFLAGS += --strip-debug
 
@@ -261,10 +261,10 @@ _HAL_INTFS_FILES :=	hal/hal_intf.o \
 			hal/led/hal_$(HCI_NAME)_led.o
 
 
-EXTRA_CFLAGS += -I$(src)/platform
+EXTRA_CFLAGS += -I$(srctree)/$(src)/platform
 _PLATFORM_FILES := platform/platform_ops.o
 
-EXTRA_CFLAGS += -I$(src)/hal/btc
+EXTRA_CFLAGS += -I$(srctree)/$(src)/hal/btc
 
 ########### HAL_RTL8188E #################################
 ifeq ($(CONFIG_RTL8188E), y)
@@ -2315,7 +2315,7 @@ ifeq ($(CONFIG_SDIO_HCI), y)
 rtk_core += core/rtw_sdio.o
 endif
 
-EXTRA_CFLAGS += -I$(src)/core/crypto
+EXTRA_CFLAGS += -I$(srctree)/$(src)/core/crypto
 rtk_core += \
 		core/crypto/aes-internal.o \
 		core/crypto/aes-internal-enc.o \
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_ap.c b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_ap.c
index 9fc656644e43..edd74756c37a 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_ap.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_ap.c
@@ -15,7 +15,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #ifndef index_mapping_NUM_88E
 	#define	index_mapping_NUM_88E	15
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_ap.h b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_ap.h
index 005e5a3b08b5..f5935d366126 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_ap.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_ap.h
@@ -17,8 +17,8 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_powertracking_ap.h"
-#include "halrf/halrf_kfree.h"
+#include "halrf_powertracking_ap.h"
+#include "halrf_kfree.h"
 
 #if (RTL8814A_SUPPORT == 1)
 	#include "halrf/rtl8814a/halrf_iqk_8814a.h"
@@ -29,7 +29,7 @@
 #endif
 
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_ce.c b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_ce.c
index d1b9c0a93dfe..095f4474febb 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_ce.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_ce.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal)\
 	do {                                                                   \
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_ce.h b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_ce.h
index 930a7b2c9cb9..b88228d47b9d 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_ce.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_ce.h
@@ -27,7 +27,7 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_kfree.h"
+#include "halrf_kfree.h"
 #if (RTL8814A_SUPPORT == 1)
 #include "halrf/rtl8814a/halrf_iqk_8814a.h"
 #endif
@@ -37,7 +37,7 @@
 #endif
 
 #if (RTL8821C_SUPPORT == 1)
-#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
@@ -53,7 +53,7 @@
 	#include "halrf/rtl8814b/halrf_txgapk_8814b.h"
 #endif
 
-#include "halrf/halrf_powertracking_ce.h"
+#include "halrf_powertracking_ce.h"
 
 enum spur_cal_method {
 	PLL_RESET,
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_iot.c b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_iot.c
index 98ab3a8e3916..035c747f80d8 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_iot.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_iot.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define	CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal) \
 	do {\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_iot.h b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_iot.h
index 31b035176424..a1839fb1a69e 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_iot.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_iot.h
@@ -27,10 +27,10 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_kfree.h"
+#include "halrf_kfree.h"
 
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
@@ -47,7 +47,7 @@
 //	#include "halrf/rtl8710c/halrf_dpk_8710c.h"
 #endif
 
-#include "halrf/halrf_powertracking_iot.h"
+#include "halrf_powertracking_iot.h"
 
 
 enum spur_cal_method {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_win.c b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_win.c
index 342d84e9f310..7fc59477a3d2 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_win.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_win.c
@@ -15,7 +15,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define	CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal) \
 	do {\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_win.h b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_win.h
index 25a7638e04ee..9311a95b9f73 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_win.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halphyrf_win.h
@@ -25,11 +25,11 @@
 	#include "halrf/rtl8822b/halrf_iqk_8822b.h"
 	#include "../mac/Halmac_type.h"
 #endif
-#include "halrf/halrf_powertracking_win.h"
-#include "halrf/halrf_kfree.h"
-#include "halrf/halrf_txgapcal.h"
+#include "halrf_powertracking_win.h"
+#include "halrf_kfree.h"
+#include "halrf_txgapcal.h"
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf.c b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf.c
index 71e06eb223f3..0602eb0698e9 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf.c
@@ -30,7 +30,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (RTL8822B_SUPPORT == 1 || RTL8821C_SUPPORT == 1 ||\
 	RTL8195B_SUPPORT == 1 || RTL8198F_SUPPORT == 1 ||\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf.h b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf.h
index 87c48ef130e5..037a0fe79c72 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf.h
@@ -30,7 +30,7 @@
 /*@============================================================*/
 /*@include files*/
 /*@============================================================*/
-#include "halrf/halrf_psd.h"
+#include "halrf_psd.h"
 #if (RTL8822B_SUPPORT == 1)
 #include "halrf/rtl8822b/halrf_rfk_init_8822b.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_debug.c b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_debug.c
index 62b9d226a9c6..e55e39eff2e2 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_debug.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_debug.c
@@ -30,7 +30,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 void halrf_basic_profile(void *dm_void, u32 *_used, char *output, u32 *_out_len)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_kfree.c b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_kfree.c
index dd7ff49bbf94..cd00486085ea 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_kfree.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_kfree.c
@@ -28,7 +28,7 @@
 /*@include files*/
 /*@============================================================*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /*@<YuChen, 150720> Add for KFree Feature Requested by RF David.*/
 /*@This is a phydm API*/
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_powertracking.c b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_powertracking.c
index 8f58de32e333..d584890665cd 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_powertracking.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_powertracking.c
@@ -29,7 +29,7 @@
  * ************************************************************
  */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 boolean
 odm_check_power_status(void *dm_void)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_powertracking_ap.c b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_powertracking_ap.c
index b22df37a179e..069957c63777 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_powertracking_ap.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_powertracking_ap.c
@@ -18,7 +18,7 @@
  * include files
  * ************************************************************ */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if !defined(_OUTSRC_COEXIST)
 /* ************************************************************
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_powertracking_ce.c b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_powertracking_ce.c
index fe27628bd145..84cfe55e4dd8 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_powertracking_ce.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_powertracking_ce.c
@@ -30,7 +30,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /*@************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_powertracking_iot.c b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_powertracking_iot.c
index 543e12963cda..c2fe69c3c7ac 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_powertracking_iot.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_powertracking_iot.c
@@ -28,7 +28,7 @@
 /* include files												*/
 /*============================================================	*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /* ************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_powertracking_win.c b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_powertracking_win.c
index f428bbd4fe67..92897572fa94 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_powertracking_win.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_powertracking_win.c
@@ -18,7 +18,7 @@
 /* include files												*/
 /*============================================================	*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /* ************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_psd.c b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_psd.c
index e87cb88f6d14..a37aba0cab8b 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_psd.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_psd.c
@@ -19,7 +19,7 @@
  *============================================================
  */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 u64 _sqrt(u64 x)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_txgapcal.c b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_txgapcal.c
index 45aec82a4ebe..f5e6b5559369 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_txgapcal.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/halrf_txgapcal.c
@@ -24,7 +24,7 @@
  *
  *****************************************************************************/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 void odm_bub_sort(u32 *data, u32 n)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/rtl8723d/halrf_8723d.c b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/rtl8723d/halrf_8723d.c
index b3952fba2dc7..36b681a754b1 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/rtl8723d/halrf_8723d.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/halrf/rtl8723d/halrf_8723d.c
@@ -17,7 +17,7 @@
 #include "mp_precomp.h"
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/txbf/haltxbf8822b.c b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/txbf/haltxbf8822b.c
index 2a266a12ff76..a28bd1ba38b7 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/txbf/haltxbf8822b.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/txbf/haltxbf8822b.c
@@ -21,7 +21,7 @@
 /*@============================================================*/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (RTL8822B_SUPPORT == 1)
 #ifdef PHYDM_BEAMFORMING_SUPPORT
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/txbf/phydm_hal_txbf_api.c b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/txbf/phydm_hal_txbf_api.c
index deb70efffec6..9fd18b60cf5c 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/txbf/phydm_hal_txbf_api.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723ds/hal/phydm/txbf/phydm_hal_txbf_api.c
@@ -15,7 +15,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (defined(CONFIG_BB_TXBF_API))
 #if (RTL8822B_SUPPORT == 1 || RTL8192F_SUPPORT == 1 || RTL8812F_SUPPORT == 1 ||\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/Makefile b/drivers/net/wireless/rockchip_wlan/rtl8821cs/Makefile
index 797d011e6756..c2321ee3e610 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/Makefile
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/Makefile
@@ -21,7 +21,7 @@ ifeq ($(GCC_VER_49),1)
 EXTRA_CFLAGS += -Wno-date-time	# Fix compile error && warning on gcc 4.9 and later
 endif
 
-EXTRA_CFLAGS += -I$(src)/include
+EXTRA_CFLAGS += -I$(srctree)/$(src)/include
 
 EXTRA_LDFLAGS += --strip-debug
 
@@ -270,10 +270,10 @@ _HAL_INTFS_FILES :=	hal/hal_intf.o \
 			hal/led/hal_$(HCI_NAME)_led.o
 
 
-EXTRA_CFLAGS += -I$(src)/platform
+EXTRA_CFLAGS += -I$(srctree)/$(src)/platform
 _PLATFORM_FILES := platform/platform_ops.o
 
-EXTRA_CFLAGS += -I$(src)/hal/btc
+EXTRA_CFLAGS += -I$(srctree)/$(src)/hal/btc
 
 ########### HAL_RTL8188E #################################
 ifeq ($(CONFIG_RTL8188E), y)
@@ -2406,7 +2406,7 @@ ifeq ($(CONFIG_SDIO_HCI), y)
 rtk_core += core/rtw_sdio.o
 endif
 
-EXTRA_CFLAGS += -I$(src)/core/crypto
+EXTRA_CFLAGS += -I$(srctree)/$(src)/core/crypto
 rtk_core += \
 		core/crypto/aes-internal.o \
 		core/crypto/aes-internal-enc.o \
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_ap.c b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_ap.c
index 9fc656644e43..edd74756c37a 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_ap.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_ap.c
@@ -15,7 +15,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #ifndef index_mapping_NUM_88E
 	#define	index_mapping_NUM_88E	15
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_ap.h b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_ap.h
index 005e5a3b08b5..f5935d366126 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_ap.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_ap.h
@@ -17,8 +17,8 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_powertracking_ap.h"
-#include "halrf/halrf_kfree.h"
+#include "halrf_powertracking_ap.h"
+#include "halrf_kfree.h"
 
 #if (RTL8814A_SUPPORT == 1)
 	#include "halrf/rtl8814a/halrf_iqk_8814a.h"
@@ -29,7 +29,7 @@
 #endif
 
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_ce.c b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_ce.c
index bee1372e5084..eacee778b85f 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_ce.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_ce.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal)\
 	do {                                                                   \
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_ce.h b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_ce.h
index 930a7b2c9cb9..b88228d47b9d 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_ce.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_ce.h
@@ -27,7 +27,7 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_kfree.h"
+#include "halrf_kfree.h"
 #if (RTL8814A_SUPPORT == 1)
 #include "halrf/rtl8814a/halrf_iqk_8814a.h"
 #endif
@@ -37,7 +37,7 @@
 #endif
 
 #if (RTL8821C_SUPPORT == 1)
-#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
@@ -53,7 +53,7 @@
 	#include "halrf/rtl8814b/halrf_txgapk_8814b.h"
 #endif
 
-#include "halrf/halrf_powertracking_ce.h"
+#include "halrf_powertracking_ce.h"
 
 enum spur_cal_method {
 	PLL_RESET,
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_iot.c b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_iot.c
index 8ed17f31462b..be273577a5d0 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_iot.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_iot.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define	CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal) \
 	do {\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_iot.h b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_iot.h
index 31b035176424..a1839fb1a69e 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_iot.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_iot.h
@@ -27,10 +27,10 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_kfree.h"
+#include "halrf_kfree.h"
 
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
@@ -47,7 +47,7 @@
 //	#include "halrf/rtl8710c/halrf_dpk_8710c.h"
 #endif
 
-#include "halrf/halrf_powertracking_iot.h"
+#include "halrf_powertracking_iot.h"
 
 
 enum spur_cal_method {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_win.c b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_win.c
index 124ffbca29e1..b902c1db50ca 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_win.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_win.c
@@ -15,7 +15,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define	CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal) \
 	do {\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_win.h b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_win.h
index 25a7638e04ee..9311a95b9f73 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_win.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halphyrf_win.h
@@ -25,11 +25,11 @@
 	#include "halrf/rtl8822b/halrf_iqk_8822b.h"
 	#include "../mac/Halmac_type.h"
 #endif
-#include "halrf/halrf_powertracking_win.h"
-#include "halrf/halrf_kfree.h"
-#include "halrf/halrf_txgapcal.h"
+#include "halrf_powertracking_win.h"
+#include "halrf_kfree.h"
+#include "halrf_txgapcal.h"
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf.c b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf.c
index fe7a9cbfb94e..08d928626e53 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf.c
@@ -30,7 +30,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (RTL8822B_SUPPORT == 1 || RTL8821C_SUPPORT == 1 ||\
 	RTL8195B_SUPPORT == 1 || RTL8198F_SUPPORT == 1 ||\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf.h b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf.h
index e0eaa7f632cd..84899f0eb8cd 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf.h
@@ -30,7 +30,7 @@
 /*@============================================================*/
 /*@include files*/
 /*@============================================================*/
-#include "halrf/halrf_psd.h"
+#include "halrf_psd.h"
 #if (RTL8822B_SUPPORT == 1)
 #include "halrf/rtl8822b/halrf_rfk_init_8822b.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_debug.c b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_debug.c
index ff79a5990a43..4af9e154bc68 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_debug.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_debug.c
@@ -30,7 +30,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 void halrf_basic_profile(void *dm_void, u32 *_used, char *output, u32 *_out_len)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_kfree.c b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_kfree.c
index 3c4a939cd585..89a905c3d6c2 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_kfree.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_kfree.c
@@ -28,7 +28,7 @@
 /*@include files*/
 /*@============================================================*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /*@<YuChen, 150720> Add for KFree Feature Requested by RF David.*/
 /*@This is a phydm API*/
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_powertracking.c b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_powertracking.c
index bde6dd15765d..2a23dfee8dc5 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_powertracking.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_powertracking.c
@@ -29,7 +29,7 @@
  * ************************************************************
  */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 boolean
 odm_check_power_status(void *dm_void)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_powertracking_ap.c b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_powertracking_ap.c
index 462b2f8b95f0..14a393591b74 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_powertracking_ap.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_powertracking_ap.c
@@ -18,7 +18,7 @@
  * include files
  * ************************************************************ */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if !defined(_OUTSRC_COEXIST)
 /* ************************************************************
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_powertracking_ce.c b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_powertracking_ce.c
index d2eb70e52a18..31151a7a0da6 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_powertracking_ce.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_powertracking_ce.c
@@ -30,7 +30,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /*@************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_powertracking_iot.c b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_powertracking_iot.c
index a6de4238ae82..66b09687dbc2 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_powertracking_iot.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_powertracking_iot.c
@@ -28,7 +28,7 @@
 /* include files												*/
 /*============================================================	*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /* ************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_powertracking_win.c b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_powertracking_win.c
index 1c02d0e4a2b8..1d42e9b163e7 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_powertracking_win.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_powertracking_win.c
@@ -18,7 +18,7 @@
 /* include files												*/
 /*============================================================	*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /* ************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_psd.c b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_psd.c
index e87cb88f6d14..a37aba0cab8b 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_psd.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_psd.c
@@ -19,7 +19,7 @@
  *============================================================
  */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 u64 _sqrt(u64 x)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_txgapcal.c b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_txgapcal.c
index 45aec82a4ebe..f5e6b5559369 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_txgapcal.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/halrf_txgapcal.c
@@ -24,7 +24,7 @@
  *
  *****************************************************************************/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 void odm_bub_sort(u32 *data, u32 n)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/rtl8821c/halhwimg8821c_rf.c b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/rtl8821c/halhwimg8821c_rf.c
index 8e1ffa7e3944..561c9562735b 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/rtl8821c/halhwimg8821c_rf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/rtl8821c/halhwimg8821c_rf.c
@@ -31,7 +31,7 @@
 
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_8821c.c b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_8821c.c
index c08d095ad34c..be96340d055c 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_8821c.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_8821c.c
@@ -17,7 +17,7 @@
 #include "mp_precomp.h"
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.c b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.c
index fa8adba63447..5bb1872238cc 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.c
@@ -17,7 +17,7 @@
 #include "mp_precomp.h"
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/txbf/haltxbf8822b.c b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/txbf/haltxbf8822b.c
index 2a266a12ff76..a28bd1ba38b7 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/txbf/haltxbf8822b.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/txbf/haltxbf8822b.c
@@ -21,7 +21,7 @@
 /*@============================================================*/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (RTL8822B_SUPPORT == 1)
 #ifdef PHYDM_BEAMFORMING_SUPPORT
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/txbf/phydm_hal_txbf_api.c b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/txbf/phydm_hal_txbf_api.c
index a6cb1e1b7f29..57f747f98465 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/txbf/phydm_hal_txbf_api.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/txbf/phydm_hal_txbf_api.c
@@ -15,7 +15,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (defined(CONFIG_BB_TXBF_API))
 #if (RTL8822B_SUPPORT == 1 || RTL8192F_SUPPORT == 1 || RTL8812F_SUPPORT == 1 ||\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/Makefile b/drivers/net/wireless/rockchip_wlan/rtl8821cu/Makefile
index 6b620f72ef27..a66940fcbe78 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/Makefile
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/Makefile
@@ -20,7 +20,7 @@ ifeq ($(GCC_VER_49),1)
 EXTRA_CFLAGS += -Wno-date-time	# Fix compile error && warning on gcc 4.9 and later
 endif
 
-EXTRA_CFLAGS += -I$(src)/include
+EXTRA_CFLAGS += -I$(srctree)/$(src)/include
 
 EXTRA_LDFLAGS += --strip-debug
 
@@ -271,10 +271,10 @@ _HAL_INTFS_FILES :=	hal/hal_intf.o \
 			hal/led/hal_$(HCI_NAME)_led.o
 
 
-EXTRA_CFLAGS += -I$(src)/platform
+EXTRA_CFLAGS += -I$(srctree)/$(src)/platform
 _PLATFORM_FILES := platform/platform_ops.o
 
-EXTRA_CFLAGS += -I$(src)/hal/btc
+EXTRA_CFLAGS += -I$(srctree)/$(src)/hal/btc
 
 ########### HAL_RTL8188E #################################
 ifeq ($(CONFIG_RTL8188E), y)
@@ -2414,7 +2414,7 @@ ifeq ($(CONFIG_SDIO_HCI), y)
 rtk_core += core/rtw_sdio.o
 endif
 
-EXTRA_CFLAGS += -I$(src)/core/crypto
+EXTRA_CFLAGS += -I$(srctree)/$(src)/core/crypto
 rtk_core += \
 		core/crypto/aes-internal.o \
 		core/crypto/aes-internal-enc.o \
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_ap.c b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_ap.c
index 857f01946842..a9da13ce8ced 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_ap.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_ap.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #ifndef index_mapping_NUM_88E
 	#define	index_mapping_NUM_88E	15
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_ap.h b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_ap.h
index 8cc2797bc58c..4c114d56dc41 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_ap.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_ap.h
@@ -16,8 +16,8 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_powertracking_ap.h"
-#include "halrf/halrf_kfree.h"
+#include "halrf_powertracking_ap.h"
+#include "halrf_kfree.h"
 
 #if (RTL8814A_SUPPORT == 1)
 	#include "halrf/rtl8814a/halrf_iqk_8814a.h"
@@ -28,7 +28,7 @@
 #endif
 
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_ce.c b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_ce.c
index 1cfb95d36b9c..a043de6b14af 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_ce.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_ce.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal)\
 	do {                                                                   \
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_ce.h b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_ce.h
index dcded1e0acb5..00e8d504c9ec 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_ce.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_ce.h
@@ -26,7 +26,7 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_kfree.h"
+#include "halrf_kfree.h"
 #if (RTL8814A_SUPPORT == 1)
 #include "halrf/rtl8814a/halrf_iqk_8814a.h"
 #endif
@@ -36,7 +36,7 @@
 #endif
 
 #if (RTL8821C_SUPPORT == 1)
-#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
@@ -52,7 +52,7 @@
 	#include "halrf/rtl8814b/halrf_txgapk_8814b.h"
 #endif
 
-#include "halrf/halrf_powertracking_ce.h"
+#include "halrf_powertracking_ce.h"
 
 enum spur_cal_method {
 	PLL_RESET,
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_iot.c b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_iot.c
index 16d9084db881..a6d89316799a 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_iot.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_iot.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define	CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal) \
 	do {\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_iot.h b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_iot.h
index 8d4395a1f74d..0f44ce423f1e 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_iot.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_iot.h
@@ -26,10 +26,10 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_kfree.h"
+#include "halrf_kfree.h"
 
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
@@ -46,7 +46,7 @@
 //	#include "halrf/rtl8710c/halrf_dpk_8710c.h"
 #endif
 
-#include "halrf/halrf_powertracking_iot.h"
+#include "halrf_powertracking_iot.h"
 
 
 enum spur_cal_method {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_win.c b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_win.c
index 679d5e094da0..fcfa26a439c7 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_win.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_win.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define	CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal) \
 	do {\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_win.h b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_win.h
index 3769d60a9126..281f3819100a 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_win.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halphyrf_win.h
@@ -24,11 +24,11 @@
 	#include "halrf/rtl8822b/halrf_iqk_8822b.h"
 	#include "../mac/Halmac_type.h"
 #endif
-#include "halrf/halrf_powertracking_win.h"
-#include "halrf/halrf_kfree.h"
-#include "halrf/halrf_txgapcal.h"
+#include "halrf_powertracking_win.h"
+#include "halrf_kfree.h"
+#include "halrf_txgapcal.h"
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf.c b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf.c
index c1bf2cc1d03b..85bd51daf0d8 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf.c
@@ -29,7 +29,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (RTL8822B_SUPPORT == 1 || RTL8821C_SUPPORT == 1 ||\
 	RTL8195B_SUPPORT == 1 || RTL8198F_SUPPORT == 1 ||\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf.h b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf.h
index 560b1fd10671..6a1171ecd179 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf.h
@@ -29,7 +29,7 @@
 /*@============================================================*/
 /*@include files*/
 /*@============================================================*/
-#include "halrf/halrf_psd.h"
+#include "halrf_psd.h"
 #if (RTL8822B_SUPPORT == 1)
 #include "halrf/rtl8822b/halrf_rfk_init_8822b.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_debug.c b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_debug.c
index 692c6f1fc764..796fd7672a61 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_debug.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_debug.c
@@ -29,7 +29,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 void halrf_basic_profile(void *dm_void, u32 *_used, char *output, u32 *_out_len)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_kfree.c b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_kfree.c
index bb18026466d5..0e7d3949a49d 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_kfree.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_kfree.c
@@ -27,7 +27,7 @@
 /*@include files*/
 /*@============================================================*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /*@<YuChen, 150720> Add for KFree Feature Requested by RF David.*/
 /*@This is a phydm API*/
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_powertracking.c b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_powertracking.c
index a1db18f95e8c..4907a07bba51 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_powertracking.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_powertracking.c
@@ -28,7 +28,7 @@
  * ************************************************************
  */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 boolean
 odm_check_power_status(void *dm_void)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_powertracking_ap.c b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_powertracking_ap.c
index 28a8091fa402..1dfa84899cca 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_powertracking_ap.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_powertracking_ap.c
@@ -17,7 +17,7 @@
  * include files
  * ************************************************************ */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if !defined(_OUTSRC_COEXIST)
 /* ************************************************************
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_powertracking_ce.c b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_powertracking_ce.c
index 6607991766f3..e6633f704c2e 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_powertracking_ce.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_powertracking_ce.c
@@ -29,7 +29,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /*@************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_powertracking_iot.c b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_powertracking_iot.c
index 494fdec37a46..d5ca81805111 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_powertracking_iot.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_powertracking_iot.c
@@ -27,7 +27,7 @@
 /* include files												*/
 /*============================================================	*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /* ************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_powertracking_win.c b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_powertracking_win.c
index 5cb9542574e7..cf7f9e1a15b3 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_powertracking_win.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_powertracking_win.c
@@ -17,7 +17,7 @@
 /* include files												*/
 /*============================================================	*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /* ************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_psd.c b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_psd.c
index bab7d09acd0b..b45702e01450 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_psd.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_psd.c
@@ -18,7 +18,7 @@
  *============================================================
  */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 u64 _sqrt(u64 x)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_txgapcal.c b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_txgapcal.c
index 0cc44974bf3f..2b81c802883a 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_txgapcal.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/halrf_txgapcal.c
@@ -23,7 +23,7 @@
  *
  *****************************************************************************/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 void odm_bub_sort(u32 *data, u32 n)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/rtl8821c/halhwimg8821c_rf.c b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/rtl8821c/halhwimg8821c_rf.c
index 2c2270bd6e35..5624743ffc11 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/rtl8821c/halhwimg8821c_rf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/rtl8821c/halhwimg8821c_rf.c
@@ -30,7 +30,7 @@
 
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/rtl8821c/halrf_8821c.c b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/rtl8821c/halrf_8821c.c
index 4d9c41875e98..bd482a5e3bad 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/rtl8821c/halrf_8821c.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/rtl8821c/halrf_8821c.c
@@ -16,7 +16,7 @@
 #include "mp_precomp.h"
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.c b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.c
index 15879c69f88a..4dcac09bead0 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.c
@@ -16,7 +16,7 @@
 #include "mp_precomp.h"
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/txbf/haltxbf8822b.c b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/txbf/haltxbf8822b.c
index a1d35c9b178d..502ec92d6388 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/txbf/haltxbf8822b.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/txbf/haltxbf8822b.c
@@ -20,7 +20,7 @@
 /*@============================================================*/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (RTL8822B_SUPPORT == 1)
 #ifdef PHYDM_BEAMFORMING_SUPPORT
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/txbf/phydm_hal_txbf_api.c b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/txbf/phydm_hal_txbf_api.c
index 33a7e71ff3f8..bcb36ec92ece 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/txbf/phydm_hal_txbf_api.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/hal/phydm/txbf/phydm_hal_txbf_api.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (defined(CONFIG_BB_TXBF_API))
 #if (RTL8822B_SUPPORT == 1 || RTL8192F_SUPPORT == 1 || RTL8812F_SUPPORT == 1 ||\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822be/Makefile b/drivers/net/wireless/rockchip_wlan/rtl8822be/Makefile
index 8737389936bf..d3696eafd5e6 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822be/Makefile
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822be/Makefile
@@ -22,8 +22,8 @@ ifeq ($(GCC_VER_49),1)
 EXTRA_CFLAGS += -Wno-date-time	# Fix compile error && warning on gcc 4.9 and later
 endif
 
-EXTRA_CFLAGS += -I$(src)/include
-EXTRA_CFLAGS += -I$(src)/hal/phydm
+EXTRA_CFLAGS += -I$(srctree)/$(src)/include
+EXTRA_CFLAGS += -I$(srctree)/$(src)/hal/phydm
 
 EXTRA_LDFLAGS += --strip-debug
 
@@ -234,11 +234,11 @@ _OUTSRC_FILES := hal/phydm/phydm_debug.o	\
 		hal/phydm/phydm_ccx.o
 
 
-EXTRA_CFLAGS += -I$(src)/platform
+EXTRA_CFLAGS += -I$(srctree)/$(src)/platform
 _PLATFORM_FILES := platform/platform_ops.o
 
 ifeq ($(CONFIG_BT_COEXIST), y)
-EXTRA_CFLAGS += -I$(src)/hal/btc
+EXTRA_CFLAGS += -I$(srctree)/$(src)/hal/btc
 _OUTSRC_FILES += hal/btc/halbtc8192e1ant.o \
 				hal/btc/halbtc8192e2ant.o \
 				hal/btc/halbtc8723b1ant.o \
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822be/hal/phydm/txbf/haltxbf8822b.c b/drivers/net/wireless/rockchip_wlan/rtl8822be/hal/phydm/txbf/haltxbf8822b.c
index c4d3f1e14cc4..351addabad77 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822be/hal/phydm/txbf/haltxbf8822b.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822be/hal/phydm/txbf/haltxbf8822b.c
@@ -7,7 +7,7 @@
 /*============================================================*/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (RTL8822B_SUPPORT == 1)
 #if (BEAMFORMING_SUPPORT == 1)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822be/hal/phydm/txbf/phydm_hal_txbf_api.c b/drivers/net/wireless/rockchip_wlan/rtl8822be/hal/phydm/txbf/phydm_hal_txbf_api.c
index 0e1828a4e9fa..c69bb2cb3f2c 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822be/hal/phydm/txbf/phydm_hal_txbf_api.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822be/hal/phydm/txbf/phydm_hal_txbf_api.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (defined(CONFIG_BB_TXBF_API))
 #if (RTL8822B_SUPPORT == 1)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822bs/Makefile b/drivers/net/wireless/rockchip_wlan/rtl8822bs/Makefile
index b0516c6a7d10..27809115a8c5 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822bs/Makefile
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822bs/Makefile
@@ -24,7 +24,7 @@ ifeq ($(GCC_VER_49),1)
 EXTRA_CFLAGS += -Wno-date-time	# Fix compile error && warning on gcc 4.9 and later
 endif
 
-EXTRA_CFLAGS += -I$(src)/include
+EXTRA_CFLAGS += -I$(srctree)/$(src)/include
 
 EXTRA_LDFLAGS += --strip-debug
 
@@ -257,10 +257,10 @@ _HAL_INTFS_FILES :=	hal/hal_intf.o \
 			hal/led/hal_$(HCI_NAME)_led.o
 
 
-EXTRA_CFLAGS += -I$(src)/platform
+EXTRA_CFLAGS += -I$(srctree)/$(src)/platform
 _PLATFORM_FILES := platform/platform_ops.o
 
-EXTRA_CFLAGS += -I$(src)/hal/btc
+EXTRA_CFLAGS += -I$(srctree)/$(src)/hal/btc
 
 ########### HAL_RTL8188E #################################
 ifeq ($(CONFIG_RTL8188E), y)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halphyrf_ce.c b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halphyrf_ce.c
index 5ff9d74b1916..2cad1c2533f8 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halphyrf_ce.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halphyrf_ce.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal)\
 	do {                                                                   \
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halphyrf_ce.h b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halphyrf_ce.h
index 3e2e16a70fac..bd110dcbd07d 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halphyrf_ce.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halphyrf_ce.h
@@ -26,7 +26,7 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_kfree.h"
+#include "halrf_kfree.h"
 #if (RTL8814A_SUPPORT == 1)
 #include "halrf/rtl8814a/halrf_iqk_8814a.h"
 #endif
@@ -36,7 +36,7 @@
 #endif
 
 #if (RTL8821C_SUPPORT == 1)
-#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
@@ -51,7 +51,7 @@
 	#include "halrf/rtl8814b/halrf_dpk_8814b.h"
 #endif
 
-#include "halrf/halrf_powertracking_ce.h"
+#include "halrf_powertracking_ce.h"
 
 enum spur_cal_method {
 	PLL_RESET,
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf.c b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf.c
index 4efcd5c1870c..0e7631bb5796 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf.c
@@ -29,7 +29,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (RTL8822B_SUPPORT == 1 || RTL8821C_SUPPORT == 1 ||\
 	RTL8195B_SUPPORT == 1 || RTL8198F_SUPPORT == 1 ||\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf.h b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf.h
index 7219224fc408..10ea7d740f69 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf.h
@@ -29,7 +29,7 @@
 /*@============================================================*/
 /*@include files*/
 /*@============================================================*/
-#include "halrf/halrf_psd.h"
+#include "halrf_psd.h"
 #if (RTL8822B_SUPPORT == 1)
 #include "halrf/rtl8822b/halrf_rfk_init_8822b.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_debug.c b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_debug.c
index 9c1783a540da..8dbd0b05ec34 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_debug.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_debug.c
@@ -29,7 +29,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 void halrf_basic_profile(void *dm_void, u32 *_used, char *output, u32 *_out_len)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_kfree.c b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_kfree.c
index 548b0e98c9df..1aaa5cc70056 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_kfree.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_kfree.c
@@ -27,7 +27,7 @@
 /*@include files*/
 /*@============================================================*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /*@<YuChen, 150720> Add for KFree Feature Requested by RF David.*/
 /*@This is a phydm API*/
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_powertracking.c b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_powertracking.c
index 25c5625a3a0c..3529954b8a3a 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_powertracking.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_powertracking.c
@@ -28,7 +28,7 @@
  * ************************************************************
  */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 boolean
 odm_check_power_status(void *dm_void)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_powertracking_ce.c b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_powertracking_ce.c
index 1ae098bfff68..c6af3eee9136 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_powertracking_ce.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_powertracking_ce.c
@@ -29,7 +29,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /*@************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_psd.c b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_psd.c
index bab7d09acd0b..b45702e01450 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_psd.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_psd.c
@@ -18,7 +18,7 @@
  *============================================================
  */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 u64 _sqrt(u64 x)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_txgapcal.c b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_txgapcal.c
index 0cc44974bf3f..2b81c802883a 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_txgapcal.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/halrf_txgapcal.c
@@ -23,7 +23,7 @@
  *
  *****************************************************************************/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 void odm_bub_sort(u32 *data, u32 n)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/rtl8822b/halhwimg8822b_rf.c b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/rtl8822b/halhwimg8822b_rf.c
index 394989612da6..a517ef72e343 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/rtl8822b/halhwimg8822b_rf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/rtl8822b/halhwimg8822b_rf.c
@@ -30,7 +30,7 @@
 
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/rtl8822b/halrf_8822b.c b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/rtl8822b/halrf_8822b.c
index 6fb16b23475b..27967f853896 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/rtl8822b/halrf_8822b.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/rtl8822b/halrf_8822b.c
@@ -26,7 +26,7 @@
 #include "mp_precomp.h"
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/rtl8822b/halrf_iqk_8822b.c b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/rtl8822b/halrf_iqk_8822b.c
index 91cea799f358..4a23622941d9 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/rtl8822b/halrf_iqk_8822b.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/rtl8822b/halrf_iqk_8822b.c
@@ -26,7 +26,7 @@
 #include "mp_precomp.h"
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/rtl8822b/halrf_rfk_init_8822b.c b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/rtl8822b/halrf_rfk_init_8822b.c
index aee6db00a5a6..268ebcfdfef4 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/rtl8822b/halrf_rfk_init_8822b.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/halrf/rtl8822b/halrf_rfk_init_8822b.c
@@ -16,7 +16,7 @@
 #include "mp_precomp.h"
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/txbf/haltxbf8822b.c b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/txbf/haltxbf8822b.c
index a1d35c9b178d..502ec92d6388 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/txbf/haltxbf8822b.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/txbf/haltxbf8822b.c
@@ -20,7 +20,7 @@
 /*@============================================================*/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (RTL8822B_SUPPORT == 1)
 #ifdef PHYDM_BEAMFORMING_SUPPORT
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/txbf/phydm_hal_txbf_api.c b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/txbf/phydm_hal_txbf_api.c
index 6c268c13fc7f..7b3b27561ce7 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/txbf/phydm_hal_txbf_api.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822bs/hal/phydm/txbf/phydm_hal_txbf_api.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (defined(CONFIG_BB_TXBF_API))
 #if (RTL8822B_SUPPORT == 1 || RTL8192F_SUPPORT == 1 ||\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/Makefile b/drivers/net/wireless/rockchip_wlan/rtl8822ce/Makefile
index bb6b4e9ffae0..dacfec80c7f5 100755
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/Makefile
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/Makefile
@@ -20,7 +20,7 @@ ifeq ($(GCC_VER_49),1)
 EXTRA_CFLAGS += -Wno-date-time	# Fix compile error && warning on gcc 4.9 and later
 endif
 
-EXTRA_CFLAGS += -I$(src)/include
+EXTRA_CFLAGS += -I$(srctree)/$(src)/include
 
 EXTRA_LDFLAGS += --strip-debug
 
@@ -281,10 +281,10 @@ _HAL_INTFS_FILES :=	hal/hal_intf.o \
 			hal/led/hal_$(HCI_NAME)_led.o
 
 
-EXTRA_CFLAGS += -I$(src)/platform
+EXTRA_CFLAGS += -I$(srctree)/$(src)/platform
 _PLATFORM_FILES := platform/platform_ops.o
 
-EXTRA_CFLAGS += -I$(src)/hal/btc
+EXTRA_CFLAGS += -I$(srctree)/$(src)/hal/btc
 
 ########### HAL_RTL8188E #################################
 ifeq ($(CONFIG_RTL8188E), y)
@@ -2444,7 +2444,7 @@ ifeq ($(CONFIG_SDIO_HCI), y)
 rtk_core += core/rtw_sdio.o
 endif
 
-EXTRA_CFLAGS += -I$(src)/core/crypto
+EXTRA_CFLAGS += -I$(srctree)/$(src)/core/crypto
 rtk_core += \
 		core/crypto/aes-internal.o \
 		core/crypto/aes-internal-enc.o \
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_ap.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_ap.c
index 0cafd6978676..c0ddd2b95538 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_ap.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_ap.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #ifndef index_mapping_NUM_88E
 	#define	index_mapping_NUM_88E	15
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_ap.h b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_ap.h
index 8cc2797bc58c..4c114d56dc41 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_ap.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_ap.h
@@ -16,8 +16,8 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_powertracking_ap.h"
-#include "halrf/halrf_kfree.h"
+#include "halrf_powertracking_ap.h"
+#include "halrf_kfree.h"
 
 #if (RTL8814A_SUPPORT == 1)
 	#include "halrf/rtl8814a/halrf_iqk_8814a.h"
@@ -28,7 +28,7 @@
 #endif
 
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_ce.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_ce.c
index 6ba960600b5f..176921a4fedb 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_ce.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_ce.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal)\
 	do {                                                                   \
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_ce.h b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_ce.h
index dcded1e0acb5..00e8d504c9ec 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_ce.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_ce.h
@@ -26,7 +26,7 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_kfree.h"
+#include "halrf_kfree.h"
 #if (RTL8814A_SUPPORT == 1)
 #include "halrf/rtl8814a/halrf_iqk_8814a.h"
 #endif
@@ -36,7 +36,7 @@
 #endif
 
 #if (RTL8821C_SUPPORT == 1)
-#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
@@ -52,7 +52,7 @@
 	#include "halrf/rtl8814b/halrf_txgapk_8814b.h"
 #endif
 
-#include "halrf/halrf_powertracking_ce.h"
+#include "halrf_powertracking_ce.h"
 
 enum spur_cal_method {
 	PLL_RESET,
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_iot.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_iot.c
index b87d5e971f49..1194527e3540 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_iot.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_iot.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define	CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal) \
 	do {\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_iot.h b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_iot.h
index 8d4395a1f74d..0f44ce423f1e 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_iot.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_iot.h
@@ -26,10 +26,10 @@
 #ifndef __HALPHYRF_H__
 #define __HALPHYRF_H__
 
-#include "halrf/halrf_kfree.h"
+#include "halrf_kfree.h"
 
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
@@ -46,7 +46,7 @@
 //	#include "halrf/rtl8710c/halrf_dpk_8710c.h"
 #endif
 
-#include "halrf/halrf_powertracking_iot.h"
+#include "halrf_powertracking_iot.h"
 
 
 enum spur_cal_method {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_win.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_win.c
index 3f7778f991dd..5f41b37c4890 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_win.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_win.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #define	CALCULATE_SWINGTALBE_OFFSET(_offset, _direction, _size, _delta_thermal) \
 	do {\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_win.h b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_win.h
index 0d5fc97a5886..d3fd71e6aa56 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_win.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halphyrf_win.h
@@ -24,11 +24,11 @@
 	#include "halrf/rtl8822b/halrf_iqk_8822b.h"
 	#include "../mac/Halmac_type.h"
 #endif
-#include "halrf/halrf_powertracking_win.h"
-#include "halrf/halrf_kfree.h"
-#include "halrf/halrf_txgapcal.h"
+#include "halrf_powertracking_win.h"
+#include "halrf_kfree.h"
+#include "halrf_txgapcal.h"
 #if (RTL8821C_SUPPORT == 1)
-	#include "halrf/rtl8821c/halrf_iqk_8821c.h"
+	#include "../../../../rtl8821cs/hal/phydm/halrf/rtl8821c/halrf_iqk_8821c.h"
 #endif
 
 #if (RTL8195B_SUPPORT == 1)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf.c
index 649d52b5d204..d0d9b2457b21 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf.c
@@ -29,7 +29,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (RTL8822B_SUPPORT == 1 || RTL8821C_SUPPORT == 1 ||\
 	RTL8195B_SUPPORT == 1 || RTL8198F_SUPPORT == 1 ||\
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf.h b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf.h
index 36caa945b6a6..6913b8b6bab6 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf.h
@@ -29,16 +29,16 @@
 /*@============================================================*/
 /*@include files*/
 /*@============================================================*/
-#include "halrf/halrf_psd.h"
+#include "halrf_psd.h"
 #if (RTL8822B_SUPPORT == 1)
 #include "halrf/rtl8822b/halrf_rfk_init_8822b.h"
 #endif
 #if (RTL8822C_SUPPORT == 1)
-#include "halrf/rtl8822c/halrf_rfk_init_8822c.h"
-#include "halrf/rtl8822c/halrf_iqk_8822c.h"
-#include "halrf/rtl8822c/halrf_tssi_8822c.h"
-#include "halrf/rtl8822c/halrf_dpk_8822c.h"
-#include "halrf/rtl8822c/halrf_txgapk_8822c.h"
+#include "rtl8822c/halrf_rfk_init_8822c.h"
+#include "rtl8822c/halrf_iqk_8822c.h"
+#include "rtl8822c/halrf_tssi_8822c.h"
+#include "rtl8822c/halrf_dpk_8822c.h"
+#include "rtl8822c/halrf_txgapk_8822c.h"
 #endif
 
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_debug.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_debug.c
index 3f2d142b6921..4b7393856c47 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_debug.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_debug.c
@@ -29,7 +29,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 void halrf_basic_profile(void *dm_void, u32 *_used, char *output, u32 *_out_len)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_kfree.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_kfree.c
index 66a9a7077fcd..67e99c0cd1d9 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_kfree.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_kfree.c
@@ -27,7 +27,7 @@
 /*@include files*/
 /*@============================================================*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /*@<YuChen, 150720> Add for KFree Feature Requested by RF David.*/
 /*@This is a phydm API*/
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_powertracking.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_powertracking.c
index 3ccbf7484f34..c3c6c9ea07d3 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_powertracking.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_powertracking.c
@@ -28,7 +28,7 @@
  * ************************************************************
  */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 boolean
 odm_check_power_status(void *dm_void)
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_powertracking_ap.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_powertracking_ap.c
index aaadf8878a47..18c4b27f1f31 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_powertracking_ap.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_powertracking_ap.c
@@ -17,7 +17,7 @@
  * include files
  * ************************************************************ */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if !defined(_OUTSRC_COEXIST)
 /* ************************************************************
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_powertracking_ce.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_powertracking_ce.c
index 4fd3de0eaa09..1641ba0b90bd 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_powertracking_ce.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_powertracking_ce.c
@@ -29,7 +29,7 @@
  */
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /*@************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_powertracking_iot.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_powertracking_iot.c
index 494fdec37a46..d5ca81805111 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_powertracking_iot.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_powertracking_iot.c
@@ -27,7 +27,7 @@
 /* include files												*/
 /*============================================================	*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /* ************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_powertracking_win.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_powertracking_win.c
index 90d2a913ea91..493a0c27c6ad 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_powertracking_win.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_powertracking_win.c
@@ -17,7 +17,7 @@
 /* include files												*/
 /*============================================================	*/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 /* ************************************************************
  * Global var
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_psd.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_psd.c
index 16fe9b96b926..6cc264d1ef04 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_psd.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_psd.c
@@ -18,7 +18,7 @@
  *============================================================
  */
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 u64 _sqrt(u64 x)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_txgapcal.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_txgapcal.c
index 0cc44974bf3f..2b81c802883a 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_txgapcal.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/halrf_txgapcal.c
@@ -23,7 +23,7 @@
  *
  *****************************************************************************/
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 void odm_bub_sort(u32 *data, u32 n)
 {
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halhwimg8822c_rf.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halhwimg8822c_rf.c
index dda1cfe39777..70e57b6498ec 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halhwimg8822c_rf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halhwimg8822c_rf.c
@@ -30,7 +30,7 @@
 
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_8822c.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_8822c.c
index efc109601256..c491d1d95874 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_8822c.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_8822c.c
@@ -26,7 +26,7 @@
 #include "mp_precomp.h"
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_dpk_8822c.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_dpk_8822c.c
index 0dce6127a8d8..9835fb9243ad 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_dpk_8822c.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_dpk_8822c.c
@@ -26,7 +26,7 @@
 #include "mp_precomp.h"
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_iqk_8822c.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_iqk_8822c.c
index 7cb70b758fbf..fdaa48d1dcba 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_iqk_8822c.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_iqk_8822c.c
@@ -26,7 +26,7 @@
 #include "mp_precomp.h"
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_rfk_init_8822c.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_rfk_init_8822c.c
index 08cb4c682b95..a83d8210e3a1 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_rfk_init_8822c.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_rfk_init_8822c.c
@@ -16,7 +16,7 @@
 #include "mp_precomp.h"
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_tssi_8822c.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_tssi_8822c.c
index 15e5d6d9e8a7..ba7af60ba1f2 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_tssi_8822c.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_tssi_8822c.c
@@ -26,7 +26,7 @@
 #include "mp_precomp.h"
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_txgapk_8822c.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_txgapk_8822c.c
index f86392bf0ecb..ff7f5c8dc9c9 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_txgapk_8822c.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/halrf/rtl8822c/halrf_txgapk_8822c.c
@@ -26,7 +26,7 @@
 #include "mp_precomp.h"
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 #if RT_PLATFORM == PLATFORM_MACOSX
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 #else
 #include "../phydm_precomp.h"
 #endif
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/txbf/haltxbf8822b.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/txbf/haltxbf8822b.c
index a1d35c9b178d..502ec92d6388 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/txbf/haltxbf8822b.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/txbf/haltxbf8822b.c
@@ -20,7 +20,7 @@
 /*@============================================================*/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (RTL8822B_SUPPORT == 1)
 #ifdef PHYDM_BEAMFORMING_SUPPORT
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/txbf/phydm_hal_txbf_api.c b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/txbf/phydm_hal_txbf_api.c
index ba0205ab4a02..63f21c908550 100644
--- a/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/txbf/phydm_hal_txbf_api.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8822ce/hal/phydm/txbf/phydm_hal_txbf_api.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 
 #include "mp_precomp.h"
-#include "phydm_precomp.h"
+#include "../phydm_precomp.h"
 
 #if (defined(CONFIG_BB_TXBF_API))
 #if (RTL8822B_SUPPORT == 1 || RTL8192F_SUPPORT == 1 || RTL8812F_SUPPORT == 1 ||\