diff --git a/configure b/configure
index 7ca6f2e7..a689604b 100755
--- a/configure
+++ b/configure
@@ -4366,6 +4366,9 @@ case $WITH_TARGET in
 	if test "X$ETCDIR" = X; then
 		ETCDIR="$prefix/etc"
 	fi
+	if test "X$INCLUDEDIR" = X; then
+		INCLUDEDIR="$prefix/include"
+	fi
 	if test "X$KMODDIR" = X; then
 		KMODDIR="$prefix/kmod"
 	fi
diff --git a/configure.ac b/configure.ac
index 332f0743..b1a7d2d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -316,6 +316,9 @@ case $WITH_TARGET in
 	if test "X$ETCDIR" = X; then
 		ETCDIR="$prefix/etc"
 	fi
+	if test "X$INCLUDEDIR" = X; then
+		INCLUDEDIR="$prefix/include"
+	fi
 	if test "X$KMODDIR" = X; then
 		KMODDIR="$prefix/kmod"
 	fi
diff --git a/executer/kernel/mcctrl/Makefile.in b/executer/kernel/mcctrl/Makefile.in
index b6187692..34bceb05 100644
--- a/executer/kernel/mcctrl/Makefile.in
+++ b/executer/kernel/mcctrl/Makefile.in
@@ -11,10 +11,21 @@ obj-m += mcctrl.o
 
 # POSTK_DEBUG_ARCH_DEP_1, arch depend "-mcmodel"
 # POSTK_DEBUG_ARCH_DEP_83, arch depend translate_rva_to_rpa() move
-ifeq ($(ARCH), arm64)
-ccflags-y := -I$(IHK_BASE)/linux/include -I$(IHK_BASE)/linux/include/ihk/arch/$(ARCH) -I$(IHK_BASE)/ikc/include -I$(IHK_BASE)/ikc/include/ikc/arch/$(ARCH) -I$(IHK_BASE)/include -I$(IHK_BASE)/include/arch/$(ARCH) -I$(src)/../../include -I$(src)/arch/$(ARCH)/include -DMCEXEC_PATH=\"$(BINDIR)/mcexec\" -I@abs_builddir@
-else
-ccflags-y := -I$(IHK_BASE)/linux/include -I$(IHK_BASE)/linux/include/ihk/arch/$(ARCH) -I$(IHK_BASE)/ikc/include -I$(IHK_BASE)/ikc/include/ikc/arch/$(ARCH) -I$(IHK_BASE)/include -I$(IHK_BASE)/include/arch/$(ARCH) -I$(src)/../../../kernel/include -I$(src)/../../include -mcmodel=kernel -mno-red-zone -DMCEXEC_PATH=\"$(BINDIR)/mcexec\" -I@abs_builddir@ -I@abs_builddir@/../../../
+ccflags-y := -I$(IHK_BASE)/linux/include \
+             -I$(IHK_BASE)/linux/include/ihk/arch/$(ARCH) \
+             -I$(IHK_BASE)/ikc/include \
+             -I$(IHK_BASE)/ikc/include/ikc/arch/$(ARCH) \
+             -I$(IHK_BASE)/include \
+             -I$(IHK_BASE)/include/arch/$(ARCH) \
+             -I$(src)/../../include \
+             -I$(src)/arch/$(ARCH)/include \
+             -I@abs_builddir@ \
+             -I@abs_builddir@/../../../ \
+             -I$(src)/../../../kernel/include \
+             -DMCEXEC_PATH=\"$(BINDIR)/mcexec\"
+
+ifneq ($(ARCH), arm64)
+ccflags-y += -mno-red-zone -mcmodel=kernel
 endif
 
 mcctrl-y := driver.o control.o ikc.o syscall.o procfs.o binfmt_mcexec.o
diff --git a/kernel/Makefile.build.in b/kernel/Makefile.build.in
index 374cb0e1..77bf0238 100644
--- a/kernel/Makefile.build.in
+++ b/kernel/Makefile.build.in
@@ -9,14 +9,18 @@ OBJS += zeroobj.o procfs.o devobj.o sysfs.o xpmem.o profile.o freeze.o
 OBJS += rbtree.o
 OBJS += pager.o
 # POSTK_DEBUG_ARCH_DEP_18 coredump arch separation.
+DEPSRCS=$(wildcard $(SRC)/*.c)
+
 # OBJS added gencore.o
 ifeq ($(ARCH), arm64)
 OBJS += gencore.o
+DEPSRCS += $(SRC)/../arch/arm64/kernel/gencore.c
 endif
-DEPSRCS=$(wildcard $(SRC)/*.c)
 
 CFLAGS += -I$(SRC)/include -I@abs_builddir@/../ -I@abs_builddir@/include -D__KERNEL__  -g -fno-omit-frame-pointer -fno-inline -fno-inline-small-functions
+ifneq ($(ARCH), arm64)
 CFLAGS += -mcmodel=large -mno-red-zone
+endif
 LDFLAGS += -e arch_start
 IHKOBJ = ihk/ihk.o
 
@@ -73,6 +77,9 @@ $(IHKOBJ): FORCE
 %.o: $(SRC)/%.c
 	$(cc_cmd)
 
+gencore.o: ../arch/arm64/kernel/gencore.c
+	$(cc_cmd)
+
 FORCE:
 
 -include Makefile.dep