diff --git a/Kbuild b/Kbuild
index 0031027df99f..3ed8e5cfecf2 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2055,7 +2055,8 @@ cppflags-y += \
 	-DNBUF_MEMORY_DEBUG \
 	-DNBUF_MAP_UNMAP_DEBUG \
 	-DTIMER_MANAGER \
-	-DWLAN_DELAYED_WORK_DEBUG
+	-DWLAN_DELAYED_WORK_DEBUG \
+	-DWLAN_PERIODIC_WORK_DEBUG
 endif
 
 cppflags-y += -DWLAN_FEATURE_P2P
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index e4f5003c8633..3b822a4f0342 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -55,6 +55,7 @@
 #include "qdf_debug_domain.h"
 #endif
 #include "qdf_delayed_work.h"
+#include "qdf_periodic_work.h"
 #include "qdf_str.h"
 #include "qdf_talloc.h"
 #include "qdf_trace.h"
@@ -79,7 +80,6 @@
 #include <linux/compat.h>
 #include <linux/reboot.h>
 #ifdef MSM_PLATFORM
-#include "qdf_periodic_work.h"
 #include <soc/qcom/subsystem_restart.h>
 #endif
 #include <wlan_hdd_hostapd.h>
@@ -2745,6 +2745,7 @@ static void hdd_check_for_leaks(struct hdd_context *hdd_ctx, bool is_ssr)
 	qdf_delayed_work_check_for_leaks();
 	qdf_mc_timer_check_for_leaks();
 	qdf_nbuf_map_check_for_leaks();
+	qdf_periodic_work_check_for_leaks();
 	qdf_mem_check_for_leaks();
 }
 
@@ -13307,6 +13308,7 @@ static QDF_STATUS hdd_qdf_init(void)
 	qdf_lock_stats_init();
 	qdf_mem_init();
 	qdf_delayed_work_feature_init();
+	qdf_periodic_work_feature_init();
 	qdf_mc_timer_manager_init();
 	qdf_event_list_init();
 
@@ -13340,6 +13342,7 @@ talloc_deinit:
 event_deinit:
 	qdf_event_list_destroy();
 	qdf_mc_timer_manager_exit();
+	qdf_periodic_work_feature_deinit();
 	qdf_delayed_work_feature_deinit();
 	qdf_mem_exit();
 	qdf_lock_stats_deinit();
@@ -13363,6 +13366,7 @@ static void hdd_qdf_deinit(void)
 	qdf_talloc_feature_deinit();
 	qdf_event_list_destroy();
 	qdf_mc_timer_manager_exit();
+	qdf_periodic_work_feature_deinit();
 	qdf_delayed_work_feature_deinit();
 	qdf_mem_exit();
 	qdf_lock_stats_deinit();