diff --git a/drivers/remote_pager/main.c b/drivers/remote_pager/main.c
index 66f303ce61c92b8da4a7f1484d3cd160e42ce48a..b7c8d8440bfac5ee8bf95f3158e2103a243416ec 100644
--- a/drivers/remote_pager/main.c
+++ b/drivers/remote_pager/main.c
@@ -10,7 +10,7 @@
 #include "msg_chan/msg_layer/msg_layer.h"
 #include "msg_handler.h"
 
-#ifdef CONFIG_REMOTE_PAGER_SLAVE
+#if IS_ENABLED(CONFIG_REMOTE_PAGER_SLAVE)
 #include "swap/device/swap_manager.h"
 #endif
 
@@ -18,7 +18,7 @@ static int __init remote_pager_init(void)
 {
 	msg_handle_init();
 
-#ifdef CONFIG_REMOTE_PAGER_SLAVE
+#if IS_ENABLED(CONFIG_REMOTE_PAGER_SLAVE)
 	init_swap_manager("list_lru");
 #endif
 	return 0;
diff --git a/drivers/remote_pager/msg_handler_comm.c b/drivers/remote_pager/msg_handler_comm.c
index 129a4247305f37de415d6fb4d6d2a29643180f56..f195ad15e646d92bf5717a8e76670b5601721f28 100644
--- a/drivers/remote_pager/msg_handler_comm.c
+++ b/drivers/remote_pager/msg_handler_comm.c
@@ -17,7 +17,7 @@
 static struct workqueue_struct *remote_pager_wq;
 
 struct msg_handler_st rpg_kmsg_cbftns[GMEM_MSG_MAX_ID] = {
-#ifdef CONFIG_REMOTE_PAGER_SLAVE
+#if IS_ENABLED(CONFIG_REMOTE_PAGER_SLAVE)
 	/* HOST TO REMOTE */
 	[GMEM_TASK_PAIRING_REQUEST] = {
 		gmem_handle_task_pairing
@@ -42,7 +42,7 @@ struct msg_handler_st rpg_kmsg_cbftns[GMEM_MSG_MAX_ID] = {
 	},
 #endif
 
-#ifdef CONFIG_REMOTE_PAGER_MASTER
+#if IS_ENABLED(CONFIG_REMOTE_PAGER_MASTER)
 	/* REMOTE TO HOST */
 	[GMEM_PAGE_FAULT_REQUEST] = {
 		gmem_handle_dev_fault