diff --git a/src/stub/src/arch/arm64/v8/lzma_d-arm.S b/src/stub/src/arch/arm64/v8/lzma_d-arm.S
index 151b9e78..a6ea41e8 100644
--- a/src/stub/src/arch/arm64/v8/lzma_d-arm.S
+++ b/src/stub/src/arch/arm64/v8/lzma_d-arm.S
@@ -72,8 +72,10 @@ RepLenCoder= (LenCoder + kNumLenProbs)
 Literal=  (RepLenCoder + kNumLenProbs)
 
 // Already #define in lzma_d.S
-//LZMA_BASE_SIZE= Literal
-//LZMA_LIT_SIZE=  768
+#ifndef LZMA_LIT_SIZE  //{
+#define LZMA_BASE_SIZE 1846
+#define LZMA_LIT_SIZE  768
+#endif  //}
 
 #define call bl  /* subroutine call */
 
diff --git a/src/stub/src/arch/arm64/v8/lzma_d.S b/src/stub/src/arch/arm64/v8/lzma_d.S
index 3def98cb..c075b7e7 100644
--- a/src/stub/src/arch/arm64/v8/lzma_d.S
+++ b/src/stub/src/arch/arm64/v8/lzma_d.S
@@ -29,7 +29,10 @@
    <jreiser@users.sourceforge.net>
 */
 
+#include "macros.S"
+
 #define section .section
+NBPW= 8
 
   section LZMA_ELF00
 //decompress:  // (uchar const *src, size_t lsrc, uchar *dst, u32 &ldst, uint method)
diff --git a/src/stub/src/arch/arm64/v8/nrv2b_d32.S b/src/stub/src/arch/arm64/v8/nrv2b_d32.S
index f4d571d7..42b28482 100644
--- a/src/stub/src/arch/arm64/v8/nrv2b_d32.S
+++ b/src/stub/src/arch/arm64/v8/nrv2b_d32.S
@@ -29,6 +29,8 @@
    <jreiser@users.sourceforge.net>
 */
 
+#include "macros.S"
+
 #define lr   x30
 #define ip0  x16
 
@@ -48,6 +50,7 @@
 #define SUB2( dst,src) sub  dst,dst,src
 #define SUB2S(dst,src) subs dst,dst,src
 #define LDRB3(reg,psrc,incr) ldrb reg,psrc,incr
+#define LDR3( reg,psrc,incr) ldr  reg,psrc,incr
 #define STRB3(reg,pdst,incr) strb reg,pdst,incr
 
 #undef  GETBIT
diff --git a/src/stub/src/arch/arm64/v8/nrv2d_d32.S b/src/stub/src/arch/arm64/v8/nrv2d_d32.S
index 25d98b76..cd82f461 100644
--- a/src/stub/src/arch/arm64/v8/nrv2d_d32.S
+++ b/src/stub/src/arch/arm64/v8/nrv2d_d32.S
@@ -28,6 +28,8 @@
    John F. Reiser
    <jreiser@users.sourceforge.net>
 */
+#include "macros.S"
+
 #define SAFE 0  /* 1 for src+dst bounds checking: cost 76 bytes */
 
 #define lr   x30
diff --git a/src/stub/src/arch/arm64/v8/nrv2e_d32.S b/src/stub/src/arch/arm64/v8/nrv2e_d32.S
index 39f49db2..d49203ff 100644
--- a/src/stub/src/arch/arm64/v8/nrv2e_d32.S
+++ b/src/stub/src/arch/arm64/v8/nrv2e_d32.S
@@ -28,6 +28,8 @@
    John F. Reiser
    <jreiser@users.sourceforge.net>
 */
+#include "macros.S"
+
 #define SAFE 0  /* 1 for src+dst bounds checking: cost 76 bytes */
 
 #define lr   x30