diff --git a/src/mem/align.h b/src/mem/align.h

index 4c6e183..03a4999 100644

--- src/mem/align.h

+++ src/mem/align.h

@@ -30,7 +30,7 @@ union max_align

       void (*q)(void);

 };

-typedef union max_align max_align_t;

+typedef union max_align h_max_align_t;

 #endif

diff --git a/src/mem/halloc.c b/src/mem/halloc.c

index b097d1f..40d0c09 100644

--- src/mem/halloc.c

+++ src/mem/halloc.c

@@ -34,7 +34,7 @@ typedef struct hblock

 #endif

       hlist_item_t  siblings; /* 2 pointers */

       hlist_head_t  children; /* 1 pointer  */

-      max_align_t   data[1];  /* not allocated, see below */

+      h_max_align_t   data[1];  /* not allocated, see below */

 } hblock_t;