diff --git a/src/internal.c b/src/internal.c
index 67beab96f..1aad57779 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -3002,11 +3002,13 @@ static int BuildMessage(CYASSL* ssl, byte* output, const byte* input, int inSz,
         sz += pad;
     }
 
+#ifdef BUILD_AESGCM
     if (ssl->specs.cipher_type == aead) {
         ivSz = AES_GCM_EXP_IV_SZ;
         sz += (ivSz + 16 - digestSz);
         AesGcmGetExpIV(&ssl->encrypt.aes, iv);
     }
+#endif
     size = (word16)(sz - headerSz);    /* include mac and digest */
     AddRecordHeader(output, size, (byte)type, ssl);    
 
diff --git a/src/keys.c b/src/keys.c
index fe699f617..0e4bc0474 100644
--- a/src/keys.c
+++ b/src/keys.c
@@ -1043,6 +1043,7 @@ int StoreKeys(CYASSL* ssl, const byte* keyData)
         XMEMCPY(ssl->keys.server_write_MAC_secret,&keyData[i], sz);
         i += sz;
     }
+#ifdef BUILD_AESGCM
     else if (ssl->specs.bulk_cipher_algorithm == aes_gcm) {
         byte iv[AES_GCM_EXP_IV_SZ];
 
@@ -1050,6 +1051,7 @@ int StoreKeys(CYASSL* ssl, const byte* keyData)
         RNG_GenerateBlock(&ssl->rng, iv, sizeof(iv));
         AesGcmSetExpIV(&ssl->encrypt.aes, iv);
     }
+#endif
 
     sz = ssl->specs.key_size;
     XMEMCPY(ssl->keys.client_write_key, &keyData[i], sz);