diff --git a/dp/inc/cdp_txrx_cmn_reg.h b/dp/inc/cdp_txrx_cmn_reg.h
index b4190189e6..0200794d3f 100644
--- a/dp/inc/cdp_txrx_cmn_reg.h
+++ b/dp/inc/cdp_txrx_cmn_reg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -56,7 +56,7 @@ ol_txrx_soc_handle ol_txrx_soc_attach(void *scn_handle, struct ol_if_ops *dp_ol_
  *
  * Return: DP SOC handle on success, NULL on failure
  */
-#ifdef QCA_WIFI_QCA8074
+#if defined(QCA_WIFI_QCA8074) || defined(QCA_WIFI_QCA6018)
 void *dp_soc_attach_wifi3(void *ctrl_psoc, void *hif_handle,
 			  HTC_HANDLE htc_handle, qdf_device_t qdf_osdev,
 			  struct ol_if_ops *ol_ops, uint16_t device_id);
diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c
index 21a2733440..ffb6ac9ea7 100644
--- a/dp/wifi3.0/dp_main.c
+++ b/dp/wifi3.0/dp_main.c
@@ -10500,7 +10500,7 @@ static void dp_soc_set_txrx_ring_map(struct dp_soc *soc)
 	}
 }
 
-#ifdef QCA_WIFI_QCA8074
+#if defined(QCA_WIFI_QCA8074) || defined(QCA_WIFI_QCA6018)
 
 #ifndef QCA_MEM_ATTACH_ON_WIFI3
 
diff --git a/dp/wifi3.0/dp_peer.c b/dp/wifi3.0/dp_peer.c
index a340198e56..ebc4e52d2e 100644
--- a/dp/wifi3.0/dp_peer.c
+++ b/dp/wifi3.0/dp_peer.c
@@ -1695,7 +1695,7 @@ static void dp_reo_desc_free(struct dp_soc *soc, void *cb_ctxt,
 	qdf_mem_free(freedesc);
 }
 
-#if defined(QCA_WIFI_QCA8074) && defined(BUILD_X86)
+#if defined(QCA_WIFI_QCA8074_VP) && defined(BUILD_X86)
 /* Hawkeye emulation requires bus address to be >= 0x50000000 */
 static inline int dp_reo_desc_addr_chk(qdf_dma_addr_t dma_addr)
 {
diff --git a/hif/src/ce/ce_main.c b/hif/src/ce/ce_main.c
index 072cfd4aed..d0415885fe 100644
--- a/hif/src/ce/ce_main.c
+++ b/hif/src/ce/ce_main.c
@@ -52,8 +52,8 @@
 #endif
 #include "mp_dev.h"
 
-#if (defined(QCA_WIFI_QCA8074) || defined(QCA_WIFI_QCA6290)) && \
-	!defined(QCA_WIFI_SUPPORT_SRNG)
+#if (defined(QCA_WIFI_QCA8074) || defined(QCA_WIFI_QCA6290) || \
+	defined(QCA_WIFI_QCA6018)) && !defined(QCA_WIFI_SUPPORT_SRNG)
 #define QCA_WIFI_SUPPORT_SRNG
 #endif
 
diff --git a/hif/src/hif_main.c b/hif/src/hif_main.c
index d5a1a0a8ce..12d9f79193 100644
--- a/hif/src/hif_main.c
+++ b/hif/src/hif_main.c
@@ -38,7 +38,7 @@
 #include "qdf_status.h"
 #include "hif_debug.h"
 #include "mp_dev.h"
-#ifdef QCA_WIFI_QCA8074
+#if defined(QCA_WIFI_QCA8074) || defined(QCA_WIFI_QCA6018)
 #include "hal_api.h"
 #endif
 #include "hif_napi.h"
@@ -486,7 +486,7 @@ void hif_close(struct hif_opaque_softc *hif_ctx)
 	qdf_mem_free(scn);
 }
 
-#if defined(QCA_WIFI_QCA8074) || \
+#if defined(QCA_WIFI_QCA8074) || defined(QCA_WIFI_QCA6018) || \
 	defined(QCA_WIFI_QCA6290) || defined(QCA_WIFI_QCA6390)
 static QDF_STATUS hif_hal_attach(struct hif_softc *scn)
 {
diff --git a/htc/htc.c b/htc/htc.c
index 3610cc7edf..baad6f1293 100644
--- a/htc/htc.c
+++ b/htc/htc.c
@@ -45,7 +45,8 @@ ATH_DEBUG_INSTANTIATE_MODULE_VAR(htc,
 
 #endif
 
-#if (defined(CONFIG_MCL) || (QCA_WIFI_QCA8074))
+#if (defined(CONFIG_MCL) || defined(QCA_WIFI_QCA8074) || \
+	defined(QCA_WIFI_QCA6018))
 static const uint32_t svc_id[] = {WMI_CONTROL_SVC, WMI_CONTROL_SVC_WMAC1,
 						WMI_CONTROL_SVC_WMAC2};
 #else
diff --git a/qdf/linux/src/qdf_mem.c b/qdf/linux/src/qdf_mem.c
index 5929bf814c..a88b993bee 100644
--- a/qdf/linux/src/qdf_mem.c
+++ b/qdf/linux/src/qdf_mem.c
@@ -1538,7 +1538,7 @@ static inline void *qdf_mem_dma_alloc(qdf_device_t osdev, void *dev,
 	return vaddr;
 }
 
-#elif defined(QCA_WIFI_QCA8074) && defined(BUILD_X86)
+#elif defined(QCA_WIFI_QCA8074_VP) && defined(BUILD_X86)
 #define QCA8074_RAM_BASE 0x50000000
 #define QDF_MEM_ALLOC_X86_MAX_RETRIES 10
 void *qdf_mem_dma_alloc(qdf_device_t osdev, void *dev, qdf_size_t size,
diff --git a/qdf/linux/src/qdf_nbuf.c b/qdf/linux/src/qdf_nbuf.c
index 97a026e9d6..fd43784c20 100644
--- a/qdf/linux/src/qdf_nbuf.c
+++ b/qdf/linux/src/qdf_nbuf.c
@@ -352,7 +352,7 @@ void __qdf_nbuf_count_dec(__qdf_nbuf_t nbuf)
 qdf_export_symbol(__qdf_nbuf_count_dec);
 #endif
 
-#if defined(QCA_WIFI_QCA8074) && defined (BUILD_X86)
+#if defined(QCA_WIFI_QCA8074_VP) && defined(BUILD_X86)
 struct sk_buff *__qdf_nbuf_alloc(qdf_device_t osdev, size_t size, int reserve,
 				 int align, int prio, const char *func,
 				 uint32_t line)
diff --git a/target_if/dfs/src/target_if_dfs_full_offload.c b/target_if/dfs/src/target_if_dfs_full_offload.c
index d5f82bb9ec..eab31e2d2f 100644
--- a/target_if/dfs/src/target_if_dfs_full_offload.c
+++ b/target_if/dfs/src/target_if_dfs_full_offload.c
@@ -390,7 +390,8 @@ free_vdevref:
 }
 #endif
 
-#if (defined(CONFIG_MCL) || (QCA_WIFI_QCA8074))
+#if (defined(CONFIG_MCL) || defined(QCA_WIFI_QCA8074) || \
+	defined(QCA_WIFI_QCA6018))
 QDF_STATUS target_process_bang_radar_cmd(
 		struct wlan_objmgr_pdev *pdev,
 		struct dfs_emulate_bang_radar_test_cmd *dfs_unit_test)