diff --git a/share/machdeps/machdep_avr_16.yaml b/share/machdeps/machdep_avr_16.yaml
index a5dea0d38f51a329c02bd7433a0f0e38c482a1ea..4094f23beb8f21b4a1f58c0b4fc142f41e495c78 100644
--- a/share/machdeps/machdep_avr_16.yaml
+++ b/share/machdeps/machdep_avr_16.yaml
@@ -9,7 +9,7 @@ alignof_longlong: 1
 alignof_ptr: 1
 alignof_short: 2
 alignof_str: 1
-max_align_t: struct {int __max_align; } __attribute__ ((aligned (8)))
+max_align_t: struct __machdep_max_align_t { int __max_align; } __attribute__ ((aligned (8)))
 bufsiz: '1024'
 char_is_unsigned: false
 compiler: clang
diff --git a/share/machdeps/machdep_avr_8.yaml b/share/machdeps/machdep_avr_8.yaml
index 3f47f1b4fed4519c0ba1d36fd7081d2469abd78a..b798abd3b5664949e5113e8803b448a5e53d5d43 100644
--- a/share/machdeps/machdep_avr_8.yaml
+++ b/share/machdeps/machdep_avr_8.yaml
@@ -9,7 +9,7 @@ alignof_longlong: 1
 alignof_ptr: 1
 alignof_short: 2
 alignof_str: 1
-max_align_t: struct {int __max_align; } __attribute__ ((aligned (8)))
+max_align_t: struct __machdep_max_align_t { int __max_align; } __attribute__ ((aligned (8)))
 bufsiz: '1024'
 char_is_unsigned: false
 compiler: clang
diff --git a/share/machdeps/machdep_gcc_x86_16.yaml b/share/machdeps/machdep_gcc_x86_16.yaml
index 8618911f857aa91033eaf572824b28ef9a1672ac..40306e9461bf08befcc0b59c576a31c49570177d 100644
--- a/share/machdeps/machdep_gcc_x86_16.yaml
+++ b/share/machdeps/machdep_gcc_x86_16.yaml
@@ -9,7 +9,7 @@ alignof_longlong: 4
 alignof_ptr: 4
 alignof_short: 2
 alignof_str: 1
-max_align_t: struct {int __max_align; } __attribute__ ((aligned (16)))
+max_align_t: struct __machdep_max_align_t { int __max_align; } __attribute__ ((aligned (16)))
 char_is_unsigned: false
 compiler: gcc
 cpp_arch_flags:
diff --git a/share/machdeps/machdep_gcc_x86_32.yaml b/share/machdeps/machdep_gcc_x86_32.yaml
index 6867691995344a6f1a6ea90c9c269e76599a16c8..1dadf4216ec5dc6a063b09c761bf1074495275b1 100644
--- a/share/machdeps/machdep_gcc_x86_32.yaml
+++ b/share/machdeps/machdep_gcc_x86_32.yaml
@@ -9,7 +9,7 @@ alignof_longlong: 4
 alignof_ptr: 4
 alignof_short: 2
 alignof_str: 1
-max_align_t: struct {int __max_align; } __attribute__ ((aligned (16)))
+max_align_t: struct __machdep_max_align_t { int __max_align; } __attribute__ ((aligned (16)))
 bufsiz: '8192'
 char_is_unsigned: false
 compiler: gcc
diff --git a/share/machdeps/machdep_x86_16.yaml b/share/machdeps/machdep_x86_16.yaml
index 6a11b922978c79464b08f5c023d55a8e46db21c6..cb1853dc8aa52dfce555188d4ccfceee8df3e2f9 100644
--- a/share/machdeps/machdep_x86_16.yaml
+++ b/share/machdeps/machdep_x86_16.yaml
@@ -9,7 +9,7 @@ alignof_longlong: 4
 alignof_ptr: 4
 alignof_short: 2
 alignof_str: 1
-max_align_t: struct {int __max_align; } __attribute__ ((aligned (16)))
+max_align_t: struct __machdep_max_align_t { int __max_align; } __attribute__ ((aligned (16)))
 char_is_unsigned: false
 compiler: generic
 cpp_arch_flags:
diff --git a/share/machdeps/machdep_x86_32.yaml b/share/machdeps/machdep_x86_32.yaml
index cecfb10922e6053cb75c024f908963ea38ff3935..78c08d4bea032cae334e5a970ef961ba48074e8d 100644
--- a/share/machdeps/machdep_x86_32.yaml
+++ b/share/machdeps/machdep_x86_32.yaml
@@ -9,7 +9,7 @@ alignof_longlong: 4
 alignof_ptr: 4
 alignof_short: 2
 alignof_str: 1
-max_align_t: struct {int __max_align; } __attribute__ ((aligned (16)))
+max_align_t: struct __machdep_max_align_t { int __max_align; } __attribute__ ((aligned (16)))
 bufsiz: '8192'
 char_is_unsigned: false
 compiler: generic
diff --git a/tests/syntax/oracle/gnu-asm-aesni.res.oracle b/tests/syntax/oracle/gnu-asm-aesni.res.oracle
index 40d08601f2ebf58d308fdd1faf05f5892e55c980..b376a0b1bd9b560ac50964f905e5ad283eda775a 100644
--- a/tests/syntax/oracle/gnu-asm-aesni.res.oracle
+++ b/tests/syntax/oracle/gnu-asm-aesni.res.oracle
@@ -8,7 +8,7 @@
 #include "string.h"
 #include "strings.h"
 typedef unsigned short byte;
-union __anonunion_PROPERLY_ALIGNED_TYPE_2 {
+union __anonunion_PROPERLY_ALIGNED_TYPE_1 {
    int a ;
    short b ;
    char c[1] ;
@@ -16,23 +16,23 @@ union __anonunion_PROPERLY_ALIGNED_TYPE_2 {
    float f ;
    double g ;
 };
-typedef union __anonunion_PROPERLY_ALIGNED_TYPE_2 PROPERLY_ALIGNED_TYPE;
-union __anonunion_u1_4 {
+typedef union __anonunion_PROPERLY_ALIGNED_TYPE_1 PROPERLY_ALIGNED_TYPE;
+union __anonunion_u1_3 {
    PROPERLY_ALIGNED_TYPE dummy ;
    byte keyschedule[14 + 1][4][4] ;
 };
-union __anonunion_u2_5 {
+union __anonunion_u2_4 {
    PROPERLY_ALIGNED_TYPE dummy ;
    byte keyschedule[14 + 1][4][4] ;
 };
-struct __anonstruct_RIJNDAEL_context_3 {
-   union __anonunion_u1_4 u1 ;
-   union __anonunion_u2_5 u2 ;
+struct __anonstruct_RIJNDAEL_context_2 {
+   union __anonunion_u1_3 u1 ;
+   union __anonunion_u2_4 u2 ;
    int rounds ;
    unsigned int decryption_prepared : 1 ;
    unsigned int use_aesni : 1 ;
 };
-typedef struct __anonstruct_RIJNDAEL_context_3 RIJNDAEL_context;
+typedef struct __anonstruct_RIJNDAEL_context_2 RIJNDAEL_context;
 __inline static void do_aesni_enc(RIJNDAEL_context const *ctx,
                                   unsigned char *b, unsigned char const *a)
 {