diff --git a/rtc_types/src/enclave_messages/mod.rs b/rtc_types/src/enclave_messages/mod.rs
index 50dfdf40..ba12bba5 100644
--- a/rtc_types/src/enclave_messages/mod.rs
+++ b/rtc_types/src/enclave_messages/mod.rs
@@ -11,5 +11,15 @@ pub struct EncryptedEnclaveMessage<const MESSAGE_SIZE: usize, const AAD_SIZE: us
     pub nonce: RecommendedAesGcmIv,
 }
 
-pub mod ffi_set_access_key;
+/// XXX: Ignore this module to work around cbindgen generic type handling
+///
+/// Issues:
+///
+/// * <https://github.com/eqrion/cbindgen/issues/7>
+/// * <https://github.com/eqrion/cbindgen/issues/286>
+/// * <https://github.com/eqrion/cbindgen/issues/573>
+///
+/// cbindgen:ignore
 pub mod set_access_key;
+
+pub mod ffi_set_access_key;
diff --git a/rtc_types/src/enclave_messages/set_access_key.rs b/rtc_types/src/enclave_messages/set_access_key.rs
index 57533669..fdb40a3f 100644
--- a/rtc_types/src/enclave_messages/set_access_key.rs
+++ b/rtc_types/src/enclave_messages/set_access_key.rs
@@ -2,7 +2,7 @@ use core::mem;
 
 use rkyv::{Archive, Deserialize, Serialize};
 
-use crate::enclave_messages::EncryptedEnclaveMessage;
+use crate::enclave_messages::{EncryptedEnclaveMessage, ARCHIVED_ENCLAVE_ID_SIZE};
 
 #[derive(Archive, Deserialize, Serialize, Debug, PartialEq, Clone)]
 pub struct Request {