diff --git a/wolfssl/wolfcrypt/aes.h b/wolfssl/wolfcrypt/aes.h
index 9325d6580..7d51334b0 100644
--- a/wolfssl/wolfcrypt/aes.h
+++ b/wolfssl/wolfcrypt/aes.h
@@ -420,11 +420,6 @@ struct Aes {
         Aes tweak;
     };
 
-    #ifndef WC_AESXTS_TYPE_DEFINED
-        typedef struct XtsAes XtsAes;
-        #define WC_AESXTS_TYPE_DEFINED
-    #endif
-
     #ifdef WOLFSSL_AESXTS_STREAM
         struct XtsAesStreamData {
             byte tweak_block[AES_BLOCK_SIZE];
@@ -432,6 +427,12 @@ struct Aes {
         };
     #endif
 
+    #ifndef WC_AESXTS_TYPE_DEFINED
+        typedef struct XtsAes XtsAes;
+        typedef struct XtsAesStreamData XtsAesStreamData;
+        #define WC_AESXTS_TYPE_DEFINED
+    #endif
+
 #endif