diff --git a/src/common.h b/src/common.h
index dcbd236..24b2f3c 100644
--- a/src/common.h
+++ b/src/common.h
@@ -335,7 +335,9 @@ enum rpc_cpe_methods_idx {
 	RPC_CPE_FACTORY_RESET,
 	RPC_CPE_SCHEDULE_INFORM,
 	RPC_CPE_SCHEDULE_DOWNLOAD,
+#ifdef ICWMP_ENABLE_SMM_SUPPORT
 	RPC_CPE_CHANGE_DU_STATE,
+#endif
 	RPC_CPE_CANCEL_TRANSFER,
 	RPC_CPE_X_FACTORY_RESET_SOFT,
 	RPC_CPE_FAULT,
@@ -347,8 +349,10 @@ enum rpc_acs_methods_idx {
 	RPC_ACS_GET_RPC_METHODS,
 	RPC_ACS_TRANSFER_COMPLETE,
 	RPC_ACS_AUTONOMOUS_TRANSFER_COMPLETE,
+#ifdef ICWMP_ENABLE_SMM_SUPPORT
 	RPC_ACS_DU_STATE_CHANGE_COMPLETE,
 	RPC_ACS_AUTONOMOUS_DU_STATE_CHANGE_COMPLETE,
+#endif
 	__RPC_ACS_MAX
 };
 
diff --git a/src/event.h b/src/event.h
index 3105cdf..a729c0d 100644
--- a/src/event.h
+++ b/src/event.h
@@ -50,8 +50,10 @@ enum event_idx_enum
 	EVENT_IDX_8DIAGNOSTICS_COMPLETE,
 	EVENT_IDX_9REQUEST_DOWNLOAD,
 	EVENT_IDX_10AUTONOMOUS_TRANSFER_COMPLETE,
+#ifdef ICWMP_ENABLE_SMM_SUPPORT
 	EVENT_IDX_11DU_STATE_CHANGE_COMPLETE,
 	EVENT_IDX_12AUTONOMOUS_DU_STATE_CHANGE_COMPLETE,
+#endif
 	EVENT_IDX_13WAKEUP,
 	EVENT_IDX_14HEARTBEAT,
 	EVENT_IDX_M_Reboot,
@@ -59,10 +61,14 @@ enum event_idx_enum
 	EVENT_IDX_M_Download,
 	EVENT_IDX_M_Schedule_Download,
 	EVENT_IDX_M_Upload,
+#ifdef ICWMP_ENABLE_SMM_SUPPORT
 	EVENT_IDX_M_ChangeDUState,
+#endif
 	TransferClt_Evt,
 	Schedule_Inform_Evt,
+#ifdef ICWMP_ENABLE_SMM_SUPPORT
 	CDU_Evt,
+#endif
 	__EVENT_IDX_MAX
 };