diff --git a/executer/user/Makefile.in b/executer/user/Makefile.in
index 494c51db..bec3f947 100644
--- a/executer/user/Makefile.in
+++ b/executer/user/Makefile.in
@@ -11,7 +11,7 @@ MCKERNEL_INCDIR=@MCKERNEL_INCDIR@
 MCKERNEL_LIBDIR=@MCKERNEL_LIBDIR@
 KDIR ?= @KDIR@
 ARCH=@ARCH@
-CFLAGS=-Wall -O -I. -I$(VPATH)/arch/${ARCH} -I${IHKDIR} -I@abs_builddir@/../../../ihk/linux/include
+CFLAGS=-Wall -O -I. -I$(VPATH)/arch/${ARCH} -I${IHKDIR} -I@abs_builddir@/../../../ihk/linux/include -I$(VPATH)/arch/${ARCH}/include
 LDFLAGS=@LDFLAGS@
 CPPFLAGS_SYSCALL_INTERCEPT=@CPPFLAGS_SYSCALL_INTERCEPT@
 LDFLAGS_SYSCALL_INTERCEPT=@LDFLAGS_SYSCALL_INTERCEPT@
@@ -47,7 +47,7 @@ mcexec: mcexec.c libmcexec.a
 # POSTK_DEBUG_ARCH_DEP_34, eclair arch depend separate.
 ifeq ($(ARCH), arm64)
 eclair: eclair.c arch/$(ARCH)/arch-eclair.c
-	$(CC) -I.. -I. -I./arch/$(ARCH)/include -I$(VPATH)/.. -I$(VPATH) -I$(VPATH)/arch/$(ARCH)/include $(CFLAGS) -o $@ $^ $(LIBS) -ldl -lz
+	$(CC) -I.. -I. -I./arch/$(ARCH)/include -I$(VPATH)/.. -I$(VPATH) $(CFLAGS) -o $@ $^ $(LIBS) -ldl -lz
 else
 eclair: eclair.c arch/$(ARCH)/arch-eclair.c
 	$(CC) -I.. -I$(VPATH) -I$(VPATH)/arch/$(ARCH)/include $(CFLAGS) -o $@ $^ $(LIBS)
diff --git a/executer/user/arch/arm64/include/arch-ldump2mcdump.h b/executer/user/arch/arm64/include/arch-ldump2mcdump.h
new file mode 100644
index 00000000..b81da389
--- /dev/null
+++ b/executer/user/arch/arm64/include/arch-ldump2mcdump.h
@@ -0,0 +1,20 @@
+/* arch-ldump2mcdump.h COPYRIGHT FUJITSU LIMITED 2017-2018 */
+#ifndef HEADER_USER_ARM64_LDUMP2MCDUMP_H
+#define HEADER_USER_ARM64_LDUMP2MCDUMP_H
+
+#ifdef CONFIG_ARM64_64K_PAGES
+/* GRANULE_SIZE == 64K_PAGE */
+#define PAGE_SHIFT		16
+
+/* same as IHK_SMP_LARGE_PAGE_SHIFT */
+#define LARGE_PAGE_SHIFT	PAGE_SHIFT
+
+#else /* CONFIG_ARM64_64K_PAGES */
+/* GRANULE_SIZE == 4K_PAGE */
+#define PAGE_SHIFT		12
+
+/* same as IHK_SMP_LARGE_PAGE_SHIFT */
+#define LARGE_PAGE_SHIFT	21
+#endif /* CONFIG_ARM64_64K_PAGES */
+
+#endif	/* HEADER_USER_ARM64_LDUMP2MCDUMP_H */
diff --git a/executer/user/arch/x86_64/include/arch-ldump2mcdump.h b/executer/user/arch/x86_64/include/arch-ldump2mcdump.h
new file mode 100644
index 00000000..ccf7c95d
--- /dev/null
+++ b/executer/user/arch/x86_64/include/arch-ldump2mcdump.h
@@ -0,0 +1,8 @@
+/* arch-ldump2mcdump.h COPYRIGHT FUJITSU LIMITED 2017 */
+#ifndef HEADER_USER_X86_64_LDUMP2MCDUMP_H
+#define HEADER_USER_X86_64_LDUMP2MCDUMP_H
+
+#define PAGE_SHIFT		12
+#define LARGE_PAGE_SHIFT	21
+
+#endif	/* HEADER_USER_X86_64_LDUMP2MCDUMP_H */
diff --git a/executer/user/ldump2mcdump.c b/executer/user/ldump2mcdump.c
index d86acee3..719bf6b1 100644
--- a/executer/user/ldump2mcdump.c
+++ b/executer/user/ldump2mcdump.c
@@ -2,6 +2,7 @@
 #include "../include/defs.h"      /* From the crash source top-level directory */
 #include <bfd.h>
 #include <pwd.h>
+#include <arch-ldump2mcdump.h>
 
 void ldump2mcdump_init(void);    /* constructor function */
 void ldump2mcdump_fini(void);    /* destructor function (optional) */
@@ -56,8 +57,6 @@ typedef struct dump_mem_chunks_s {
 #define DUMP_MEM_SYMBOL	"dump_page_set_addr"
 #define BOOTSTRAP_MEM_SYMBOL	"dump_bootstrap_mem_start"
 #define MCDUMP_DEFAULT_FILENAME	"mcdump"
-#define PAGE_SHIFT         12
-#define LARGE_PAGE_SHIFT   21
 #define LARGE_PAGE_SIZE    (1UL << LARGE_PAGE_SHIFT)
 #define LARGE_PAGE_MASK    (~((unsigned long)LARGE_PAGE_SIZE - 1))