diff --git a/include/target/casiowin-cg/bits/__trapa.h b/include/target/casiowin-cg/bits/__trapa.h
index 3644cd3..c7f36dc 100644
--- a/include/target/casiowin-cg/bits/__trapa.h
+++ b/include/target/casiowin-cg/bits/__trapa.h
@@ -1,5 +1,5 @@
-#ifndef __ASM_CASIO_TRAPA_H__
-# define __ASM_CASIO_TRAPA_H__
+#ifndef __FXLIBC_TARGET_CASIOWIN_CG_TRAPA_H__
+# define __FXLIBC_TARGET_CASIOWIN_CG_TRAPA_H__
 
 /*
 ** Normally the SH3/SH4 processor provide a "trapa" instruction which allow
@@ -10,7 +10,6 @@
 ** The convention whant that the user jump into the syscall trampoline code
 ** located at 0x80010070 for fx9860g and 0x80020070 for fxcg20/50.
 */
-#ifdef __SUPPORT_CASIO_ABI_FXCG50
 # define casio_trapa(id)		\
 	mov.l	syscall_table, r2	;\
 	mov.l	syscall_id, r0		;\
@@ -19,6 +18,5 @@
 .align 4				;\
 syscall_table:	.long 0x80020070	;\
 syscall_id:	.long id
-#endif
 
-#endif /*__ASM__CASIO_TRAPA_H__*/
+#endif /*__FXLIBC_TARGET_CASIOWIN_CG_TRAPA_H__*/
diff --git a/include/target/casiowin-fx/bits/trapa.h b/include/target/casiowin-fx/bits/trapa.h
index b63fffa..0334824 100644
--- a/include/target/casiowin-fx/bits/trapa.h
+++ b/include/target/casiowin-fx/bits/trapa.h
@@ -1,5 +1,5 @@
-#ifndef __FXLIBC_TARGET_CASIOWIN-FX_TRAPA_H__
-# define __FXLIBC_TARGET_CASIOWIN-FX_TRAPA_H__
+#ifndef __FXLIBC_TARGET_CASIOWIN_FX_TRAPA_H__
+# define __FXLIBC_TARGET_CASIOWIN_FX_TRAPA_H__
 
 /*
 ** Normally the SH3/SH4 processor provide a "trapa" instruction which allow
@@ -10,7 +10,6 @@
 ** The convention whant that the user jump into the syscall trampoline code
 ** located at 0x80010070 for fx9860g and 0x80020070 for fxcg20/50.
 */
-#ifdef __SUPPORT_CASIO_ABI_FX9860G
 # define casio_trapa(id)		\
 	mov.l	syscall_table, r2	;\
 	mov.l	syscall_id, r0		;\
@@ -19,6 +18,5 @@
 .align 4				;\
 syscall_table:	.long 0x80010070	;\
 syscall_id:	.long id
-#endif
 
-#endif /*__FXLIBC_TARGET_CASIOWIN-FX_TRAPA_H__*/
+#endif /*__FXLIBC_TARGET_CASIOWIN_FX_TRAPA_H__*/
diff --git a/src/libc/signal/target/vhex-sh/kill.S b/src/libc/signal/target/vhex-sh/kill.S
index 5890243..5b882d3 100644
--- a/src/libc/signal/target/vhex-sh/kill.S
+++ b/src/libc/signal/target/vhex-sh/kill.S
@@ -1,4 +1,3 @@
-#ifdef __SUPPORT_VHEX_KERNEL
 #include <bits/asm/unistd_32.h>
 .text
 .global	_kill
@@ -17,4 +16,3 @@ _kill:
 	rts
 	nop
 .end
-#endif
diff --git a/src/libc/signal/target/vhex-sh/signal.S b/src/libc/signal/target/vhex-sh/signal.S
index cef5641..e288726 100644
--- a/src/libc/signal/target/vhex-sh/signal.S
+++ b/src/libc/signal/target/vhex-sh/signal.S
@@ -1,4 +1,3 @@
-#ifdef __SUPPORT_VHEX_KERNEL
 #include <bits/asm/unistd_32.h>
 .text
 .global	_signal
@@ -16,4 +15,3 @@ _signal:
 	rts
 	nop
 .end
-#endif
diff --git a/src/libc/stdlib/target/vhex-sh/free.S b/src/libc/stdlib/target/vhex-sh/free.S
index ed8aad4..a757603 100644
--- a/src/libc/stdlib/target/vhex-sh/free.S
+++ b/src/libc/stdlib/target/vhex-sh/free.S
@@ -1,4 +1,3 @@
-#ifdef __SUPPORT_VHEX_KERNEL
 #include <bits/asm/unistd_32.h>
 .text
 .global	_free
@@ -20,4 +19,3 @@ _free:
 	rts
 	nop
 .end
-#endif
diff --git a/src/libc/stdlib/target/vhex-sh/malloc.S b/src/libc/stdlib/target/vhex-sh/malloc.S
index bab6574..b980af4 100644
--- a/src/libc/stdlib/target/vhex-sh/malloc.S
+++ b/src/libc/stdlib/target/vhex-sh/malloc.S
@@ -1,4 +1,3 @@
-#ifdef __SUPPORT_VHEX_KERNEL
 #include <bits/asm/unistd_32.h>
 .text
 .global	_malloc
@@ -20,4 +19,3 @@ _malloc:
 	rts
 	nop
 .end
-#endif
diff --git a/src/libc/stdlib/target/vhex-sh/realloc.S b/src/libc/stdlib/target/vhex-sh/realloc.S
index aaa7afb..2eea8da 100644
--- a/src/libc/stdlib/target/vhex-sh/realloc.S
+++ b/src/libc/stdlib/target/vhex-sh/realloc.S
@@ -1,4 +1,3 @@
-#ifdef __SUPPORT_VHEX_KERNEL
 #include <bits/asm/unistd_32.h>
 .text
 .global	_realloc
@@ -40,4 +39,3 @@ call_realloc:
 	rts
 	nop
 .end
-#endif
diff --git a/src/posix/fcntl/target/vhex-sh/open.S b/src/posix/fcntl/target/vhex-sh/open.S
index e0fc4e3..6d6cd65 100644
--- a/src/posix/fcntl/target/vhex-sh/open.S
+++ b/src/posix/fcntl/target/vhex-sh/open.S
@@ -1,4 +1,3 @@
-#ifdef __SUPPORT_VHEX_KERNEL
 #include <bits/asm/unistd_32.h>
 .text
 .global	_open
@@ -18,4 +17,3 @@ _open:
 	rts
 	nop
 .end
-#endif
diff --git a/src/posix/sys/wait/target/vhex-sh/wait.S b/src/posix/sys/wait/target/vhex-sh/wait.S
index 7e5fa49..7adb6b5 100644
--- a/src/posix/sys/wait/target/vhex-sh/wait.S
+++ b/src/posix/sys/wait/target/vhex-sh/wait.S
@@ -1,4 +1,3 @@
-#ifdef __SUPPORT_VHEX_KERNEL
 #include <bits/asm/unistd_32.h>
 .text
 .global	_wait
@@ -16,4 +15,3 @@ _wait:
 	rts
 	nop
 .end
-#endif
diff --git a/src/posix/sys/wait/target/vhex-sh/waitpid.S b/src/posix/sys/wait/target/vhex-sh/waitpid.S
index f55b3e6..cfcfb2f 100644
--- a/src/posix/sys/wait/target/vhex-sh/waitpid.S
+++ b/src/posix/sys/wait/target/vhex-sh/waitpid.S
@@ -1,4 +1,3 @@
-#ifdef __SUPPORT_VHEX_KERNEL
 #include <bits/asm/unistd_32.h>
 .text
 .global	_waitpid
@@ -26,4 +25,3 @@ _waitpid:
 	rts
 	nop
 .end
-#endif
diff --git a/src/posix/unistd/target/casiowin-fx/close.S b/src/posix/unistd/target/casiowin-fx/close.S
index ba36eae..7dd04d1 100644
--- a/src/posix/unistd/target/casiowin-fx/close.S
+++ b/src/posix/unistd/target/casiowin-fx/close.S
@@ -1,6 +1,5 @@
-#ifdef __SUPPORT_CASIO_ABI_FX9860G
 #include <bits/unistd_32.h>
-#include <bits/__trapa.h>
+#include <bits/trapa.h>
 .text
 .global	_close
 .type	_close, @function
@@ -17,4 +16,3 @@ _close:
 	rts
 	nop
 .end
-#endif
diff --git a/src/posix/unistd/target/vhex-sh/close.S b/src/posix/unistd/target/vhex-sh/close.S
index 977f179..466e448 100644
--- a/src/posix/unistd/target/vhex-sh/close.S
+++ b/src/posix/unistd/target/vhex-sh/close.S
@@ -1,4 +1,3 @@
-#ifdef __SUPPORT_VHEX_KERNEL
 #include <bits/asm/unistd_32.h>
 .text
 .global	_close
@@ -16,4 +15,3 @@ _close:
 	rts
 	nop
 .end
-#endif
diff --git a/src/posix/unistd/target/vhex-sh/fork_execve.S b/src/posix/unistd/target/vhex-sh/fork_execve.S
index 0b903f0..2ed984c 100644
--- a/src/posix/unistd/target/vhex-sh/fork_execve.S
+++ b/src/posix/unistd/target/vhex-sh/fork_execve.S
@@ -1,4 +1,3 @@
-#ifdef __SUPPORT_VHEX_KERNEL
 #include <bits/asm/unistd_32.h>
 .text
 .global	_fork_execve
@@ -21,4 +20,3 @@ _fork_execve:
 	rts
 	nop
 .end
-#endif
diff --git a/src/posix/unistd/target/vhex-sh/getpgid.S b/src/posix/unistd/target/vhex-sh/getpgid.S
index d5beff7..9b06ddb 100644
--- a/src/posix/unistd/target/vhex-sh/getpgid.S
+++ b/src/posix/unistd/target/vhex-sh/getpgid.S
@@ -1,4 +1,3 @@
-#ifdef __SUPPORT_VHEX_KERNEL
 #include <bits/asm/unistd_32.h>
 .text
 .global	_getpgid
@@ -15,4 +14,3 @@ _getpgid:
 	rts
 	nop
 .end
-#endif
diff --git a/src/posix/unistd/target/vhex-sh/getpid.S b/src/posix/unistd/target/vhex-sh/getpid.S
index d19131f..83bde68 100644
--- a/src/posix/unistd/target/vhex-sh/getpid.S
+++ b/src/posix/unistd/target/vhex-sh/getpid.S
@@ -1,4 +1,3 @@
-#ifdef __SUPPORT_VHEX_KERNEL
 #include <bits/asm/unistd_32.h>
 .text
 .global	_getpid
@@ -15,4 +14,3 @@ _getpid:
 	rts
 	nop
 .end
-#endif
diff --git a/src/posix/unistd/target/vhex-sh/getppid.S b/src/posix/unistd/target/vhex-sh/getppid.S
index 5fb352f..c36d46d 100644
--- a/src/posix/unistd/target/vhex-sh/getppid.S
+++ b/src/posix/unistd/target/vhex-sh/getppid.S
@@ -1,4 +1,3 @@
-#ifdef __SUPPORT_VHEX_KERNEL
 #include <bits/asm/unistd_32.h>
 .text
 .global	_getppid
@@ -15,4 +14,3 @@ _getppid:
 	rts
 	nop
 .end
-#endif
diff --git a/src/posix/unistd/target/vhex-sh/lseek.S b/src/posix/unistd/target/vhex-sh/lseek.S
index 65b80ae..f564bfa 100644
--- a/src/posix/unistd/target/vhex-sh/lseek.S
+++ b/src/posix/unistd/target/vhex-sh/lseek.S
@@ -1,4 +1,3 @@
-#ifdef __SUPPORT_VHEX_KERNEL
 #include <bits/asm/unistd_32.h>
 .text
 .global	_lseek
@@ -18,4 +17,3 @@ _lseek:
 	rts
 	nop
 .end
-#endif
diff --git a/src/posix/unistd/target/vhex-sh/read.S b/src/posix/unistd/target/vhex-sh/read.S
index d2518b3..2a0a918 100644
--- a/src/posix/unistd/target/vhex-sh/read.S
+++ b/src/posix/unistd/target/vhex-sh/read.S
@@ -1,4 +1,3 @@
-#ifdef __SUPPORT_VHEX_KERNEL
 #include <bits/asm/unistd_32.h>
 .text
 .global	_read
@@ -16,4 +15,3 @@ _read:
 	rts
 	nop
 .end
-#endif
diff --git a/src/posix/unistd/target/vhex-sh/setpgid.S b/src/posix/unistd/target/vhex-sh/setpgid.S
index 6ffb99b..92f08bc 100644
--- a/src/posix/unistd/target/vhex-sh/setpgid.S
+++ b/src/posix/unistd/target/vhex-sh/setpgid.S
@@ -1,4 +1,3 @@
-#ifdef __SUPPORT_VHEX_KERNEL
 #include <bits/asm/unistd_32.h>
 .text
 .global	_setpgid
@@ -17,4 +16,3 @@ _setpgid:
 	rts
 	nop
 .end
-#endif
diff --git a/src/posix/unistd/target/vhex-sh/write.S b/src/posix/unistd/target/vhex-sh/write.S
index c6f6992..13597e1 100644
--- a/src/posix/unistd/target/vhex-sh/write.S
+++ b/src/posix/unistd/target/vhex-sh/write.S
@@ -1,4 +1,3 @@
-#ifdef __SUPPORT_VHEX_KERNEL
 #include <bits/asm/unistd_32.h>
 .text
 .global	_write
@@ -16,4 +15,3 @@ _write:
 	rts
 	nop
 .end
-#endif