diff --git a/src/blake2.h b/src/blake2.h
index f8aba833ed..aa19a30c8f 100644
--- a/src/blake2.h
+++ b/src/blake2.h
@@ -61,7 +61,7 @@ extern "C" {
     uint8_t  personal[BLAKE2S_PERSONALBYTES];  // 32
   } blake2s_param;
 
-  ALIGN( 64 ) typedef struct __blake2s_state
+  typedef struct __blake2s_state
   {
     uint32_t h[8];
     uint32_t t[2];
@@ -86,7 +86,7 @@ extern "C" {
     uint8_t  personal[BLAKE2B_PERSONALBYTES];  // 64
   } blake2b_param;
 
-  ALIGN( 64 ) typedef struct __blake2b_state
+  typedef struct __blake2b_state
   {
     uint64_t h[8];
     uint64_t t[2];
@@ -95,7 +95,9 @@ extern "C" {
     size_t   buflen;
     uint8_t  last_node;
   } blake2b_state;
+#pragma pack(pop)
 
+  // Parallel state structures - outside pack(1) due to aligned member arrays
   typedef struct __blake2sp_state
   {
     blake2s_state S[8][1];
@@ -111,7 +113,6 @@ extern "C" {
     uint8_t buf[4 * BLAKE2B_BLOCKBYTES];
     size_t  buflen;
   } blake2bp_state;
-#pragma pack(pop)
 
   // Streaming API
   int blake2s_init( blake2s_state *S, const uint8_t outlen );