diff --git a/test/test_cmac.c b/test/test_cmac.c
index 446267f0..f4ab49ed 100644
--- a/test/test_cmac.c
+++ b/test/test_cmac.c
@@ -22,9 +22,6 @@
 #include <openssl/core_names.h>
 
 #include "unit.h"
-#undef AES_BLOCK_SIZE
-#include <wolfssl/options.h>
-#include <wolfssl/wolfcrypt/cmac.h>
 
 #ifdef WP_HAVE_CMAC
 
@@ -262,4 +259,3 @@ int test_cmac_create(void *data)
 
 #endif /* WP_HAVE_CMAC */
 
-
diff --git a/test/test_gmac.c b/test/test_gmac.c
index 0b96cc99..fc023571 100644
--- a/test/test_gmac.c
+++ b/test/test_gmac.c
@@ -22,9 +22,6 @@
 #include <openssl/core_names.h>
 
 #include "unit.h"
-#undef AES_BLOCK_SIZE
-#include <wolfssl/options.h>
-#include <wolfssl/wolfcrypt/aes.h>
 
 #ifdef WP_HAVE_GMAC
 
@@ -195,10 +192,10 @@ int test_gmac_dup(void *data)
     (void)data;
 
     /* Build full messages used for one-shot expected MAC calculations. */
-    XMEMCPY(msgA, prefix, sizeof(prefix));
-    XMEMCPY(msgA + sizeof(prefix), tailA, sizeof(tailA));
-    XMEMCPY(msgB, prefix, sizeof(prefix));
-    XMEMCPY(msgB + sizeof(prefix), tailB, sizeof(tailB));
+    memcpy(msgA, prefix, sizeof(prefix));
+    memcpy(msgA + sizeof(prefix), tailA, sizeof(tailA));
+    memcpy(msgB, prefix, sizeof(prefix));
+    memcpy(msgB + sizeof(prefix), tailB, sizeof(tailB));
 
     /* Compute expected MACs for each post-duplication branch. */
     ret = test_gmac_gen_mac(wpLibCtx, cipher, iv, (int)sizeof(iv), key,