diff --git a/Kbuild b/Kbuild
index 11a99f954b70..129f60d923c0 100644
--- a/Kbuild
+++ b/Kbuild
@@ -999,7 +999,8 @@ OS_IF_INC := -I$(WLAN_COMMON_INC)/os_if/linux \
             -I$(WLAN_COMMON_INC)/os_if/linux/spectral/inc \
             -I$(WLAN_COMMON_INC)/os_if/linux/tdls/inc
 
-OS_IF_OBJ := $(OS_IF_DIR)/linux/p2p/src/wlan_cfg80211_p2p.o
+OS_IF_OBJ := $(OS_IF_DIR)/linux/p2p/src/wlan_cfg80211_p2p.o \
+	     $(OS_IF_DIR)/linux/wlan_osif_request_manager.o
 
 ############ UMAC_DISP ############
 UMAC_DISP_DIR := umac/global_umac_dispatcher/lmac_if
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index f6863dff4fa6..d56a0c1fec8e 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -55,6 +55,7 @@
 #include "wlan_hdd_stats.h"
 #include "wlan_hdd_scan.h"
 #include "wlan_hdd_request_manager.h"
+#include <wlan_osif_request_manager.h>
 #ifdef CONFIG_LEAK_DETECTION
 #include "qdf_debug_domain.h"
 #endif
@@ -6663,6 +6664,7 @@ static void hdd_wlan_exit(struct hdd_context *hdd_ctx)
 	 */
 
 	hdd_request_manager_deinit();
+	osif_request_manager_deinit();
 
 	hdd_close_all_adapters(hdd_ctx, false);
 
@@ -10566,6 +10568,7 @@ int hdd_wlan_startup(struct device *dev)
 	mutex_init(&hdd_ctx->avoid_freq_lock);
 #endif
 
+	osif_request_manager_init();
 	hdd_request_manager_init();
 	qdf_atomic_init(&hdd_ctx->con_mode_flag);
 
@@ -10685,6 +10688,7 @@ err_memdump_deinit:
 	hdd_driver_memdump_deinit();
 
 	hdd_request_manager_deinit();
+	osif_request_manager_deinit();
 	hdd_exit_netlink_services(hdd_ctx);
 
 	hdd_objmgr_release_and_destroy_psoc(hdd_ctx);