diff --git a/src/apple2.h b/src/apple2.h
index ec0e2e60..81c9889c 100644
--- a/src/apple2.h
+++ b/src/apple2.h
@@ -27,10 +27,10 @@
 /* Symbol naming issues */
 #ifdef NO_UNDERSCORES
 #define         SN(foo) foo
-#define         E(foo)          .globl foo; ALIGN; foo##:
+#define         E(foo)          .globl foo; .balign 16; foo##:
 #else /* !NO_UNDERSCORES */
 #define         SN(foo) _##foo
-#define         E(foo)          .globl _##foo; ALIGN; _##foo##:
+#define         E(foo)          .globl _##foo; .balign 16; _##foo##:
 #endif /* !NO_UNDERSCORES */
 
 #endif /* _A2_H_ */
diff --git a/src/x86/cpu-regs.h b/src/x86/cpu-regs.h
index 51a6d637..4d2af6a4 100644
--- a/src/x86/cpu-regs.h
+++ b/src/x86/cpu-regs.h
@@ -11,14 +11,6 @@
 
 #include "cpu.h"
 
-#if defined(__LP64__)
-#   error TBD
-#elif defined(__i486__) || defined(__i586__) || defined(__i686__)
-#   define ALIGN .balign 16
-#else
-#   define ALIGN .balign 4
-#endif
-
 #define X_Reg           %bl             /* 6502 X register in %bl  */
 #define Y_Reg           %bh             /* 6502 Y register in %bh  */
 #define A_Reg           %cl             /* 6502 A register in %cl  */