diff --git a/lib/bt_matchfinder.h b/lib/bt_matchfinder.h
index c6231a2..d129598 100644
--- a/lib/bt_matchfinder.h
+++ b/lib/bt_matchfinder.h
@@ -99,11 +99,7 @@ struct bt_matchfinder {
 	 * 'child_tab[pos * 2]' and 'child_tab[pos * 2 + 1]', respectively.  */
 	mf_pos_t child_tab[2UL * MATCHFINDER_WINDOW_SIZE];
 
-}
-#ifdef _aligned_attribute
-_aligned_attribute(MATCHFINDER_MEM_ALIGNMENT)
-#endif
-;
+} MATCHFINDER_ALIGNED;
 
 /* Prepare the matchfinder for a new input buffer.  */
 static forceinline void
diff --git a/lib/hc_matchfinder.h b/lib/hc_matchfinder.h
index bc4c811..23daead 100644
--- a/lib/hc_matchfinder.h
+++ b/lib/hc_matchfinder.h
@@ -129,11 +129,7 @@ struct hc_matchfinder {
 	 * the node for the sequence with position 'pos' is 'next_tab[pos]'.  */
 	mf_pos_t next_tab[MATCHFINDER_WINDOW_SIZE];
 
-}
-#ifdef _aligned_attribute
-  _aligned_attribute(MATCHFINDER_MEM_ALIGNMENT)
-#endif
-;
+} MATCHFINDER_ALIGNED;
 
 /* Prepare the matchfinder for a new input buffer.  */
 static forceinline void
diff --git a/lib/matchfinder_common.h b/lib/matchfinder_common.h
index 49ff334..5aa3325 100644
--- a/lib/matchfinder_common.h
+++ b/lib/matchfinder_common.h
@@ -28,11 +28,14 @@ typedef s16 mf_pos_t;
 #undef matchfinder_init
 #undef matchfinder_rebase
 #ifdef _aligned_attribute
+#  define MATCHFINDER_ALIGNED _aligned_attribute(MATCHFINDER_MEM_ALIGNMENT)
 #  if defined(__arm__) || defined(__aarch64__)
 #    include "arm/matchfinder_impl.h"
 #  elif defined(__i386__) || defined(__x86_64__)
 #    include "x86/matchfinder_impl.h"
 #  endif
+#else
+#  define MATCHFINDER_ALIGNED
 #endif
 
 /*