diff --git a/src/wh_client_crypto.c b/src/wh_client_crypto.c
index 5b61db3e1..108be1d21 100644
--- a/src/wh_client_crypto.c
+++ b/src/wh_client_crypto.c
@@ -2823,6 +2823,7 @@ int wh_Client_AesGetKeyId(Aes* key, whNvmId* outId)
     *outId = WH_DEVCTX_TO_KEYID(key->devCtx);
     return WH_ERROR_OK;
 }
+#endif /* !NO_AES */
 
 #ifdef WOLFSSL_CMAC
 int wh_Client_CmacSetKeyId(Cmac* key, whNvmId keyId)
@@ -2868,7 +2869,6 @@ int wh_Client_Cmac(whClientContext* ctx, Cmac* cmac, CmacType type,
     WH_DEBUG_CLIENT_VERBOSE("cmac key:%p key_len:%d in:%p in_len:%d out:%p out_len:%d "
            "keyId:%x\n",
            key, (int)keyLen, in, (int)inLen, outMac, (int)mac_len, key_id);
-#endif
 
 
     /* Get data pointer */
diff --git a/wolfhsm/wh_nvm_flash_log.h b/wolfhsm/wh_nvm_flash_log.h
index 42d879623..260a2dfce 100644
--- a/wolfhsm/wh_nvm_flash_log.h
+++ b/wolfhsm/wh_nvm_flash_log.h
@@ -19,10 +19,10 @@
 #ifndef WOLFHSM_WH_NVM_FLASH_LOG_H_
 #define WOLFHSM_WH_NVM_FLASH_LOG_H_
 
-#if defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG)
-
 #include "wolfhsm/wh_settings.h"
 
+#if defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG)
+
 #include "wolfhsm/wh_common.h"
 #include "wolfhsm/wh_flash.h"