diff --git a/dp/inc/cdp_txrx_ipa.h b/dp/inc/cdp_txrx_ipa.h
index 64ebbaa15b..f61adf948f 100644
--- a/dp/inc/cdp_txrx_ipa.h
+++ b/dp/inc/cdp_txrx_ipa.h
@@ -30,7 +30,7 @@
  */
 #ifndef _CDP_TXRX_IPA_H_
 #define _CDP_TXRX_IPA_H_
-#include <ipa.h>
+#include <linux/ipa.h>
 #include <cdp_txrx_mob_def.h>
 #include "cdp_txrx_handle.h"
 
diff --git a/dp/inc/cdp_txrx_ops.h b/dp/inc/cdp_txrx_ops.h
index f344397264..edcdca0d84 100644
--- a/dp/inc/cdp_txrx_ops.h
+++ b/dp/inc/cdp_txrx_ops.h
@@ -33,7 +33,7 @@
 #include <cdp_txrx_mon_struct.h>
 #include "wlan_objmgr_psoc_obj.h"
 #ifdef IPA_OFFLOAD
-#include <ipa.h>
+#include <linux/ipa.h>
 #endif
 
 /******************************************************************************
diff --git a/dp/wifi3.0/dp_rx.c b/dp/wifi3.0/dp_rx.c
index 8c3228aa8a..fd2f5e77d1 100644
--- a/dp/wifi3.0/dp_rx.c
+++ b/dp/wifi3.0/dp_rx.c
@@ -22,7 +22,7 @@
 #include "hal_rx.h"
 #include "hal_api.h"
 #include "qdf_nbuf.h"
-#include <ieee80211.h>
+#include <linux/ieee80211.h>
 #ifdef MESH_MODE_SUPPORT
 #include "if_meta_hdr.h"
 #endif
diff --git a/dp/wifi3.0/dp_rx_defrag.h b/dp/wifi3.0/dp_rx_defrag.h
index 12def6822b..4e6b5ac769 100644
--- a/dp/wifi3.0/dp_rx_defrag.h
+++ b/dp/wifi3.0/dp_rx_defrag.h
@@ -24,7 +24,7 @@
 #ifdef CONFIG_MCL
 #include <cds_ieee80211_common.h>
 #else
-#include <ieee80211.h>
+#include <linux/ieee80211.h>
 #endif
 
 #define DEFRAG_IEEE80211_ADDR_LEN	6
diff --git a/dp/wifi3.0/dp_rx_err.c b/dp/wifi3.0/dp_rx_err.c
index f36c7a290f..44cc5d3eb3 100644
--- a/dp/wifi3.0/dp_rx_err.c
+++ b/dp/wifi3.0/dp_rx_err.c
@@ -26,7 +26,7 @@
 #ifdef CONFIG_MCL
 #include <cds_ieee80211_common.h>
 #else
-#include <ieee80211.h>
+#include <linux/ieee80211.h>
 #endif
 #include "dp_rx_defrag.h"
 #include <enet.h>	/* LLC_SNAP_HDR_LEN */
diff --git a/dp/wifi3.0/dp_rx_mon_dest.c b/dp/wifi3.0/dp_rx_mon_dest.c
index 41e5e89056..b67728e7ae 100644
--- a/dp/wifi3.0/dp_rx_mon_dest.c
+++ b/dp/wifi3.0/dp_rx_mon_dest.c
@@ -24,7 +24,7 @@
 #include "qdf_trace.h"
 #include "qdf_nbuf.h"
 #include "hal_api_mon.h"
-#include "ieee80211.h"
+#include "linux/ieee80211.h"
 #include "dp_rx_mon.h"
 #include "wlan_cfg.h"
 
diff --git a/dp/wifi3.0/dp_rx_mon_status.c b/dp/wifi3.0/dp_rx_mon_status.c
index cc87364a6d..324ef3787c 100644
--- a/dp/wifi3.0/dp_rx_mon_status.c
+++ b/dp/wifi3.0/dp_rx_mon_status.c
@@ -23,7 +23,7 @@
 #include "qdf_trace.h"
 #include "qdf_nbuf.h"
 #include "hal_api_mon.h"
-#include "ieee80211.h"
+#include "linux/ieee80211.h"
 #include "dp_rx_mon.h"
 #include "dp_internal.h"
 #include "qdf_mem.h"   /* qdf_mem_malloc,free */
diff --git a/dp/wifi3.0/dp_types.h b/dp/wifi3.0/dp_types.h
index d983429a5e..d57abd86ee 100644
--- a/dp/wifi3.0/dp_types.h
+++ b/dp/wifi3.0/dp_types.h
@@ -33,7 +33,7 @@
 #ifdef CONFIG_MCL
 #include <cds_ieee80211_common.h>
 #else
-#include <ieee80211.h>
+#include <linux/ieee80211.h>
 #endif
 
 #ifndef CONFIG_WIN
diff --git a/hif/src/hif_irq_affinity.c b/hif/src/hif_irq_affinity.c
index 92e88590db..2f8b611e15 100644
--- a/hif/src/hif_irq_affinity.c
+++ b/hif/src/hif_irq_affinity.c
@@ -23,7 +23,7 @@
  * an abstraction layer...  Should this be moved into a /linux folder?
  */
 
-#include <string.h> /* memset */
+#include <linux/string.h> /* memset */
 
 /* Linux headers */
 #include <linux/cpumask.h>
diff --git a/hif/src/hif_napi.c b/hif/src/hif_napi.c
index 4a97747a23..c5f7359566 100644
--- a/hif/src/hif_napi.c
+++ b/hif/src/hif_napi.c
@@ -31,7 +31,7 @@
  * HIF NAPI interface implementation
  */
 
-#include <string.h> /* memset */
+#include <linux/string.h> /* memset */
 
 /* Linux headers */
 #include <linux/cpumask.h>
diff --git a/qdf/linux/src/i_qdf_trace.h b/qdf/linux/src/i_qdf_trace.h
index c7bcf01e2c..8ed6b02856 100644
--- a/qdf/linux/src/i_qdf_trace.h
+++ b/qdf/linux/src/i_qdf_trace.h
@@ -36,8 +36,8 @@
 #define __I_QDF_TRACE_H
 
 /* older kernels have a bug in kallsyms, so ensure module.h is included */
-#include <module.h>
-#include <kallsyms.h>
+#include <linux/module.h>
+#include <linux/kallsyms.h>
 
 #if !defined(__printf)
 #define __printf(a, b)
diff --git a/qdf/linux/src/qdf_threads.c b/qdf/linux/src/qdf_threads.c
index c5e4ed106d..493c8eae0e 100644
--- a/qdf/linux/src/qdf_threads.c
+++ b/qdf/linux/src/qdf_threads.c
@@ -44,7 +44,7 @@
 #include <linux/interrupt.h>
 #include <linux/export.h>
 #include <linux/kthread.h>
-#include <stacktrace.h>
+#include <linux/stacktrace.h>
 
 /* Function declarations and documenation */
 
diff --git a/utils/logging/src/wlan_logging_sock_svc.c b/utils/logging/src/wlan_logging_sock_svc.c
index 795fcddadd..ddfc6dccb1 100644
--- a/utils/logging/src/wlan_logging_sock_svc.c
+++ b/utils/logging/src/wlan_logging_sock_svc.c
@@ -31,7 +31,7 @@
 ******************************************************************************/
 
 #ifdef WLAN_LOGGING_SOCK_SVC_ENABLE
-#include <vmalloc.h>
+#include <linux/vmalloc.h>
 #ifdef CONFIG_MCL
 #include <cds_api.h>
 #include <host_diag_core_event.h>
@@ -43,7 +43,7 @@
 #include "pktlog_ac.h"
 #endif
 #include <wlan_logging_sock_svc.h>
-#include <kthread.h>
+#include <linux/kthread.h>
 #include <qdf_time.h>
 #include <qdf_trace.h>
 #include <qdf_mc_timer.h>