diff --git a/include/nitro/hw/ARM7/mmap_wram.h b/include/nitro/hw/ARM7/mmap_wram.h
index 6aacee4..602d4ee 100644
--- a/include/nitro/hw/ARM7/mmap_wram.h
+++ b/include/nitro/hw/ARM7/mmap_wram.h
@@ -88,6 +88,8 @@ extern "C" {
 //---- offset in system reserved area
 #define HW_PRV_WRAM_SYSRV               (HW_PRV_WRAM + HW_PRV_WRAM_SIZE - HW_PRV_WRAM_SYSRV_SIZE)
 #define HW_PRV_WRAM_SYSRV_OFS_INTR_CHECK2    0x00
+#define HW_PRV_WRAM_SYSRV_OFS_EXCP_STACK     0x10
+#define HW_PRV_WRAM_SYSRV_OFS_EXCP_STACK_END 0x1c
 #define HW_PRV_WRAM_SYSRV_OFS_EXCP_VECTOR    0x1c
 #define HW_PRV_WRAM_SYSRV_OFS_DMA_CLEAR_BUF  0x20       // 16bytes
 #define HW_PRV_WRAM_SYSRV_OFS_WM_RESERVED_0  0x30
diff --git a/include/nitro/os/common/interrupt.h b/include/nitro/os/common/interrupt.h
index 6522d84..075a087 100644
--- a/include/nitro/os/common/interrupt.h
+++ b/include/nitro/os/common/interrupt.h
@@ -113,11 +113,12 @@ void    OSi_EnterTimerCallback(u32 timerNo, void (*callback) (void *), void *arg
 #define OS_IE_FIFO_RECV         OS_IE_SPFIFO_RECV
 
 // Dummy irq check flag for user own use
+#if 0
 #define OS_IE_USER_FLAG0_SHIFT  31
 #define OS_IE_USER_FLAG1_SHIFT  30
 #define OS_IE_USER_FLAG0        (1UL << OS_IE_USER_FLAG0_SHIFT) // user 0
 #define OS_IE_USER_FLAG1        (1UL << OS_IE_USER_FLAG1_SHIFT) // user 1
-
+#endif
 
 //---- used for internal functions
 #define OSi_IRQCALLBACK_NO_DMA0    0
diff --git a/include/twl/memorymap.h b/include/twl/memorymap.h
index 2946787..d55d623 100644
--- a/include/twl/memorymap.h
+++ b/include/twl/memorymap.h
@@ -26,16 +26,16 @@ extern "C" {
 #include	<nitro/hw/ARM9/mmap_tcm.h>
 #include	<nitro/hw/ARM9/mmap_vram.h>
 #include	<nitro/hw/common/mmap_shared.h>
-#include	<twl/hw/ARM9/ioreg.h>
 
 #else  //SDK_ARM7
 #include	<nitro/hw/ARM7/mmap_global.h>
 #include	<nitro/hw/ARM7/mmap_main.h>
 #include	<nitro/hw/ARM7/mmap_wram.h>
 #include	<nitro/hw/common/mmap_shared.h>
-#include	<twl/hw/ARM7/ioreg.h>
 #endif
 
+#include	<twl/ioreg.h>
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
diff --git a/include/twl/mi/exDma.h b/include/twl/mi/exDma.h
index 0fa31fc..3b172d6 100644
--- a/include/twl/mi/exDma.h
+++ b/include/twl/mi/exDma.h
@@ -17,8 +17,8 @@
 #define TWL_MI_EXDMA_H_
 
 #include <nitro/misc.h>
-#include <nitro/types.h>
-#include <nitro/memorymap.h>
+#include <twl/types.h>
+#include <twl/memorymap.h>
 
 #ifdef __cplusplus
 extern "C" {