diff --git a/include/internal/libspdm_requester_lib.h b/include/internal/libspdm_requester_lib.h
index f358dee5a72..a55e4400251 100644
--- a/include/internal/libspdm_requester_lib.h
+++ b/include/internal/libspdm_requester_lib.h
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
+ *  Copyright 2021-2024 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -637,6 +637,7 @@ bool libspdm_verify_key_exchange_rsp_signature(
     libspdm_context_t *spdm_context, libspdm_session_info_t *session_info,
     const void *sign_data, const size_t sign_data_size);
 
+#if LIBSPDM_ENABLE_CAPABILITY_MEAS_CAP
 /**
  * This function verifies the measurement signature based upon l1l2.
  * If session_info is NULL, this function will use M cache of SPDM context,
@@ -654,5 +655,6 @@ bool libspdm_verify_measurement_signature(libspdm_context_t *spdm_context,
                                           libspdm_session_info_t *session_info,
                                           const void *sign_data,
                                           size_t sign_data_size);
+#endif /* LIBSPDM_ENABLE_CAPABILITY_MEAS_CAP*/
 
 #endif /* SPDM_REQUESTER_LIB_INTERNAL_H */
diff --git a/include/internal/libspdm_responder_lib.h b/include/internal/libspdm_responder_lib.h
index 0a919e81b22..919c04ae10b 100644
--- a/include/internal/libspdm_responder_lib.h
+++ b/include/internal/libspdm_responder_lib.h
@@ -900,6 +900,7 @@ bool libspdm_generate_key_exchange_rsp_signature(libspdm_context_t *spdm_context
                                                  libspdm_session_info_t *session_info,
                                                  uint8_t *signature);
 
+#if LIBSPDM_ENABLE_CAPABILITY_MEAS_CAP
 /**
  * This function generates the measurement signature to response message based upon l1l2.
  * If session_info is NULL, this function will use M cache of SPDM context,
@@ -915,5 +916,6 @@ bool libspdm_generate_key_exchange_rsp_signature(libspdm_context_t *spdm_context
 bool libspdm_generate_measurement_signature(libspdm_context_t *spdm_context,
                                             libspdm_session_info_t *session_info,
                                             uint8_t *signature);
+#endif /* LIBSPDM_ENABLE_CAPABILITY_MEAS_CAP*/
 
 #endif /* SPDM_RESPONDER_LIB_INTERNAL_H */
diff --git a/include/library/spdm_requester_lib.h b/include/library/spdm_requester_lib.h
index 5741ad958a6..00105f8be06 100644
--- a/include/library/spdm_requester_lib.h
+++ b/include/library/spdm_requester_lib.h
@@ -233,6 +233,7 @@ libspdm_return_t libspdm_challenge_ex2(void *spdm_context, void *reserved,
                                        void *opaque_data,
                                        size_t *opaque_data_size);
 
+#if LIBSPDM_ENABLE_CAPABILITY_MEAS_CAP
 /**
  * This function sends GET_MEASUREMENT
  * to get measurement from the device.
@@ -345,6 +346,7 @@ libspdm_return_t libspdm_get_measurement_ex2(void *spdm_context, const uint32_t
                                              void *responder_nonce,
                                              void *opaque_data,
                                              size_t *opaque_data_size);
+#endif /* LIBSPDM_ENABLE_CAPABILITY_MEAS_CAP*/
 
 #if (LIBSPDM_ENABLE_CAPABILITY_KEY_EX_CAP) || (LIBSPDM_ENABLE_CAPABILITY_PSK_CAP)
 /**