diff --git a/CMakeLists.txt b/CMakeLists.txt
index b38b16a..53664d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,6 +122,9 @@ endif()
 
 add_library(fxlibc ${SOURCES})
 target_include_directories(fxlibc PRIVATE include/)
+foreach(FOLDER IN LISTS TARGET_FOLDERS)
+  target_include_directories(fxlibc PRIVATE include/target/${FOLDER}/)
+endforeach()
 
 set_target_properties(fxlibc PROPERTIES
   OUTPUT_NAME "c") # libc.a
@@ -132,5 +135,7 @@ install(TARGETS fxlibc DESTINATION lib/)
 install(DIRECTORY include/ DESTINATION include/ PATTERN "target" EXCLUDE)
 
 foreach(FOLDER IN LISTS TARGET_FOLDERS)
-  install(DIRECTORY include/target/${FOLDER}/ DESTINATION include/)
+  if(EXISTS include/target/${FOLDER}/)
+    install(DIRECTORY include/target/${FOLDER}/ DESTINATION include/)
+  endif()
 endforeach()
diff --git a/include/fxlibc/fcntl.h b/include/fcntl.h
similarity index 100%
rename from include/fxlibc/fcntl.h
rename to include/fcntl.h
diff --git a/include/fxlibc/sys/signal.h b/include/fxlibc/sys/signal.h
deleted file mode 100644
index 3938c55..0000000
--- a/include/fxlibc/sys/signal.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <fxlibc/signal.h>
diff --git a/include/fxlibc/setjmp.h b/include/setjmp.h
similarity index 100%
rename from include/fxlibc/setjmp.h
rename to include/setjmp.h
diff --git a/include/fxlibc/signal.h b/include/signal.h
similarity index 100%
rename from include/fxlibc/signal.h
rename to include/signal.h
diff --git a/include/fxlibc/stdio.h b/include/stdio.h
similarity index 100%
rename from include/fxlibc/stdio.h
rename to include/stdio.h
diff --git a/include/fxlibc/stdlib.h b/include/stdlib.h
similarity index 100%
rename from include/fxlibc/stdlib.h
rename to include/stdlib.h
diff --git a/include/fxlibc/string.h b/include/string.h
similarity index 100%
rename from include/fxlibc/string.h
rename to include/string.h
diff --git a/include/fxlibc/sys/mman.h b/include/sys/mman.h
similarity index 100%
rename from include/fxlibc/sys/mman.h
rename to include/sys/mman.h
diff --git a/include/sys/signal.h b/include/sys/signal.h
new file mode 100644
index 0000000..2e602da
--- /dev/null
+++ b/include/sys/signal.h
@@ -0,0 +1 @@
+#include <signal.h>
diff --git a/include/fxlibc/sys/stat.h b/include/sys/stat.h
similarity index 100%
rename from include/fxlibc/sys/stat.h
rename to include/sys/stat.h
diff --git a/include/fxlibc/sys/syscall.h b/include/sys/syscall.h
similarity index 86%
rename from include/fxlibc/sys/syscall.h
rename to include/sys/syscall.h
index 659e0c6..c96c8c5 100644
--- a/include/fxlibc/sys/syscall.h
+++ b/include/sys/syscall.h
@@ -6,13 +6,13 @@
 ** But instead of duplicating this we use the information available
 ** from the kernel sources.
 */
-#include <fxlibc/asm/unistd.h>
+#include <bits/unistd.h>
 
 /*
 ** The Linux kernel header file defines macros __NR_*, but some
 ** programs expect the traditional form SYS_*.  <bits/syscall.h>
 ** defines SYS_* macros for __NR_* macros of known names.
 */
-#include <fxlibc/bits/syscall.h>
+#include <bits/syscall.h>
 
 #endif
diff --git a/include/fxlibc/sys/types.h b/include/sys/types.h
similarity index 100%
rename from include/fxlibc/sys/types.h
rename to include/sys/types.h
diff --git a/include/fxlibc/sys/wait.h b/include/sys/wait.h
similarity index 95%
rename from include/fxlibc/sys/wait.h
rename to include/sys/wait.h
index 9f50819..88edd22 100644
--- a/include/fxlibc/sys/wait.h
+++ b/include/sys/wait.h
@@ -9,10 +9,10 @@
 ** This will define the `W*' macros for the flag bits to `waitpid', `wait3',
 ** and `wait4'.
 */
-#include <fxlibc/bits/waitflags.h>
+#include <bits/waitflags.h>
 
 /* This will define all the `__W*' macros.*/
-#include <fxlibc/bits/waitstatus.h>
+#include <bits/waitstatus.h>
 
 /* Macros for the `waitpid`'s wstatus argument. */
 #define WEXITSTATUS(status)	__WEXITSTATUS(status)
diff --git a/include/fxlibc/syscall.h b/include/syscall.h
similarity index 100%
rename from include/fxlibc/syscall.h
rename to include/syscall.h
diff --git a/include/fxlibc/target/casiowin-cg/__trapa.h b/include/target/casiowin-cg/bits/__trapa.h
similarity index 100%
rename from include/fxlibc/target/casiowin-cg/__trapa.h
rename to include/target/casiowin-cg/bits/__trapa.h
diff --git a/include/target/casiowin-cg/bits/confname.h b/include/target/casiowin-cg/bits/confname.h
new file mode 100644
index 0000000..39733dc
--- /dev/null
+++ b/include/target/casiowin-cg/bits/confname.h
@@ -0,0 +1,7 @@
+#ifndef __BITS_CONFNAME_H__
+# define __BITS_CONFNAME_H__
+
+#define _SC_PAGE_SIZE	0
+#define _SC_PAGESIZE	_SC_PAGE_SIZE
+
+#endif /*__BITS_CONFNAME_H__*/
diff --git a/include/fxlibc/target/casiowin-cg/unistd_32.h b/include/target/casiowin-cg/bits/unistd_32.h
similarity index 100%
rename from include/fxlibc/target/casiowin-cg/unistd_32.h
rename to include/target/casiowin-cg/bits/unistd_32.h
diff --git a/include/target/casiowin-fx/bits/confname.h b/include/target/casiowin-fx/bits/confname.h
new file mode 100644
index 0000000..39733dc
--- /dev/null
+++ b/include/target/casiowin-fx/bits/confname.h
@@ -0,0 +1,7 @@
+#ifndef __BITS_CONFNAME_H__
+# define __BITS_CONFNAME_H__
+
+#define _SC_PAGE_SIZE	0
+#define _SC_PAGESIZE	_SC_PAGE_SIZE
+
+#endif /*__BITS_CONFNAME_H__*/
diff --git a/include/fxlibc/target/casiowin-fx/trapa.h b/include/target/casiowin-fx/bits/trapa.h
similarity index 100%
rename from include/fxlibc/target/casiowin-fx/trapa.h
rename to include/target/casiowin-fx/bits/trapa.h
diff --git a/include/fxlibc/target/casiowin-fx/unistd_32.h b/include/target/casiowin-fx/bits/unistd_32.h
similarity index 100%
rename from include/fxlibc/target/casiowin-fx/unistd_32.h
rename to include/target/casiowin-fx/bits/unistd_32.h
diff --git a/include/target/gint/bits/confname.h b/include/target/gint/bits/confname.h
new file mode 100644
index 0000000..39733dc
--- /dev/null
+++ b/include/target/gint/bits/confname.h
@@ -0,0 +1,7 @@
+#ifndef __BITS_CONFNAME_H__
+# define __BITS_CONFNAME_H__
+
+#define _SC_PAGE_SIZE	0
+#define _SC_PAGESIZE	_SC_PAGE_SIZE
+
+#endif /*__BITS_CONFNAME_H__*/
diff --git a/include/fxlibc/target/vhex-generic/asm/unistd_32.h b/include/target/vhex-generic/bits/asm/unistd_32.h
similarity index 100%
rename from include/fxlibc/target/vhex-generic/asm/unistd_32.h
rename to include/target/vhex-generic/bits/asm/unistd_32.h
diff --git a/include/fxlibc/target/vhex-generic/confname.h b/include/target/vhex-generic/bits/confname.h
similarity index 100%
rename from include/fxlibc/target/vhex-generic/confname.h
rename to include/target/vhex-generic/bits/confname.h
diff --git a/include/fxlibc/target/vhex-generic/fcntl.h b/include/target/vhex-generic/bits/fcntl.h
similarity index 100%
rename from include/fxlibc/target/vhex-generic/fcntl.h
rename to include/target/vhex-generic/bits/fcntl.h
diff --git a/include/fxlibc/target/vhex-generic/setjmp.h b/include/target/vhex-generic/bits/setjmp.h
similarity index 100%
rename from include/fxlibc/target/vhex-generic/setjmp.h
rename to include/target/vhex-generic/bits/setjmp.h
diff --git a/include/fxlibc/target/vhex-generic/sigaction.h b/include/target/vhex-generic/bits/sigaction.h
similarity index 100%
rename from include/fxlibc/target/vhex-generic/sigaction.h
rename to include/target/vhex-generic/bits/sigaction.h
diff --git a/include/fxlibc/target/vhex-generic/signum.h b/include/target/vhex-generic/bits/signum.h
similarity index 100%
rename from include/fxlibc/target/vhex-generic/signum.h
rename to include/target/vhex-generic/bits/signum.h
diff --git a/include/fxlibc/target/vhex-generic/types/FILE.h b/include/target/vhex-generic/bits/types/FILE.h
similarity index 100%
rename from include/fxlibc/target/vhex-generic/types/FILE.h
rename to include/target/vhex-generic/bits/types/FILE.h
diff --git a/include/fxlibc/target/vhex-generic/types/__FILE.h b/include/target/vhex-generic/bits/types/__FILE.h
similarity index 100%
rename from include/fxlibc/target/vhex-generic/types/__FILE.h
rename to include/target/vhex-generic/bits/types/__FILE.h
diff --git a/include/fxlibc/target/vhex-generic/types/struct_FILE.h b/include/target/vhex-generic/bits/types/struct_FILE.h
similarity index 92%
rename from include/fxlibc/target/vhex-generic/types/struct_FILE.h
rename to include/target/vhex-generic/bits/types/struct_FILE.h
index f284604..086ccd7 100644
--- a/include/fxlibc/target/vhex-generic/types/struct_FILE.h
+++ b/include/target/vhex-generic/bits/types/struct_FILE.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include <fxlibc/sys/types.h>
+#include <sys/types.h>
 
 //---
 // TODO: VFS abstraction ? or ABI-spesific abstraction ?
diff --git a/include/fxlibc/target/vhex-generic/waitflags.h b/include/target/vhex-generic/bits/waitflags.h
similarity index 100%
rename from include/fxlibc/target/vhex-generic/waitflags.h
rename to include/target/vhex-generic/bits/waitflags.h
diff --git a/include/fxlibc/target/vhex-generic/waitstatus.h b/include/target/vhex-generic/bits/waitstatus.h
similarity index 100%
rename from include/fxlibc/target/vhex-generic/waitstatus.h
rename to include/target/vhex-generic/bits/waitstatus.h
diff --git a/include/fxlibc/threads.h b/include/threads.h
similarity index 100%
rename from include/fxlibc/threads.h
rename to include/threads.h
diff --git a/include/fxlibc/unistd.h b/include/unistd.h
similarity index 100%
rename from include/fxlibc/unistd.h
rename to include/unistd.h
diff --git a/src/libc/signal/target/vhex-sh/kill.S b/src/libc/signal/target/vhex-sh/kill.S
index 815375e..5890243 100644
--- a/src/libc/signal/target/vhex-sh/kill.S
+++ b/src/libc/signal/target/vhex-sh/kill.S
@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd_32.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_kill
 .type	_kill, @function
diff --git a/src/libc/signal/target/vhex-sh/signal.S b/src/libc/signal/target/vhex-sh/signal.S
index 45d2700..cef5641 100644
--- a/src/libc/signal/target/vhex-sh/signal.S
+++ b/src/libc/signal/target/vhex-sh/signal.S
@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd_32.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_signal
 .type	_signal, @function
diff --git a/src/libc/stdio/dprintf.c b/src/libc/stdio/dprintf.c
index a269730..f7f5bbc 100644
--- a/src/libc/stdio/dprintf.c
+++ b/src/libc/stdio/dprintf.c
@@ -1,4 +1,4 @@
-#include <fxlibc/stdio.h>
+#include <stdio.h>
 
 /*
 ** The function dprintf() is the same as fprintf() except that it outputs to a
diff --git a/src/libc/stdio/internal/printf_actions.c b/src/libc/stdio/internal/printf_actions.c
index 96733a3..8fa9e73 100644
--- a/src/libc/stdio/internal/printf_actions.c
+++ b/src/libc/stdio/internal/printf_actions.c
@@ -1,4 +1,4 @@
-#include <fxlibc/stdio.h>
+#include <stdio.h>
 
 // internal depency
 #include "printf.h"
diff --git a/src/libc/stdio/internal/printf_common.c b/src/libc/stdio/internal/printf_common.c
index fbe5880..66083d8 100644
--- a/src/libc/stdio/internal/printf_common.c
+++ b/src/libc/stdio/internal/printf_common.c
@@ -1,4 +1,4 @@
-#include <fxlibc/stdio.h>
+#include <stdio.h>
 
 // internal depency
 #include "printf.h"
diff --git a/src/libc/stdio/internal/printf_options.c b/src/libc/stdio/internal/printf_options.c
index 5f38303..2b045e4 100644
--- a/src/libc/stdio/internal/printf_options.c
+++ b/src/libc/stdio/internal/printf_options.c
@@ -1,4 +1,4 @@
-#include <fxlibc/stdio.h>
+#include <stdio.h>
 
 // internal depency
 #include "printf.h"
diff --git a/src/libc/stdio/printf.c b/src/libc/stdio/printf.c
index d9ea9f7..88feb6e 100644
--- a/src/libc/stdio/printf.c
+++ b/src/libc/stdio/printf.c
@@ -1,5 +1,5 @@
-#include <fxlibc/stdio.h>
-#include <fxlibc/unistd.h>
+#include <stdio.h>
+#include <unistd.h>
 
 /*
 ** printf() write the output under the control of a format string that specifies
diff --git a/src/libc/stdio/putc.c b/src/libc/stdio/putc.c
index b379ca1..cfa9c94 100644
--- a/src/libc/stdio/putc.c
+++ b/src/libc/stdio/putc.c
@@ -1,5 +1,5 @@
-#include <fxlibc/stdio.h>
-#include <fxlibc/unistd.h>
+#include <stdio.h>
+#include <unistd.h>
 
 int putchar(int c)
 {
diff --git a/src/libc/stdio/puts.c b/src/libc/stdio/puts.c
index 30d7302..418dcc8 100644
--- a/src/libc/stdio/puts.c
+++ b/src/libc/stdio/puts.c
@@ -1,6 +1,6 @@
-#include <fxlibc/stdio.h>
-#include <fxlibc/string.h>
-#include <fxlibc/unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 
 /*
 ** puts() writes the string s and a trailing newline to stdout.
diff --git a/src/libc/stdio/snprintf.c b/src/libc/stdio/snprintf.c
index 9f8b4ae..08cf2c5 100644
--- a/src/libc/stdio/snprintf.c
+++ b/src/libc/stdio/snprintf.c
@@ -1,4 +1,4 @@
-#include <fxlibc/stdio.h>
+#include <stdio.h>
 
 /*
 ** sprintf(),  snprintf(), vsprintf() and vsnprintf() write the output under the
diff --git a/src/libc/stdio/sprintf.c b/src/libc/stdio/sprintf.c
index 5f569dd..e6aa357 100644
--- a/src/libc/stdio/sprintf.c
+++ b/src/libc/stdio/sprintf.c
@@ -1,4 +1,4 @@
-#include <fxlibc/stdio.h>
+#include <stdio.h>
 
 /*
 ** sprintf(),  snprintf(), vsprintf() and vsnprintf() write the output under the
diff --git a/src/libc/stdio/vdprintf.c b/src/libc/stdio/vdprintf.c
index 516fa79..b86b776 100644
--- a/src/libc/stdio/vdprintf.c
+++ b/src/libc/stdio/vdprintf.c
@@ -1,5 +1,5 @@
-#include <fxlibc/stdio.h>
-#include <fxlibc/unistd.h>
+#include <stdio.h>
+#include <unistd.h>
 
 // internal depency
 #include "internal/printf.h"
diff --git a/src/libc/stdio/vsnprintf.c b/src/libc/stdio/vsnprintf.c
index 4182aef..571e036 100644
--- a/src/libc/stdio/vsnprintf.c
+++ b/src/libc/stdio/vsnprintf.c
@@ -1,4 +1,4 @@
-#include <fxlibc/stdio.h>
+#include <stdio.h>
 
 // internal depency
 #include "internal/printf.h"
diff --git a/src/libc/stdio/vsprintf.c b/src/libc/stdio/vsprintf.c
index e1a63e9..a9cdd9d 100644
--- a/src/libc/stdio/vsprintf.c
+++ b/src/libc/stdio/vsprintf.c
@@ -1,4 +1,4 @@
-#include <fxlibc/stdio.h>
+#include <stdio.h>
 
 /*
 ** The functions vsprintf() are equivalent to the sprintf() except that  they
diff --git a/src/libc/stdlib/calloc.c b/src/libc/stdlib/calloc.c
index 89f08e6..91e3b95 100644
--- a/src/libc/stdlib/calloc.c
+++ b/src/libc/stdlib/calloc.c
@@ -1,6 +1,6 @@
-#include <fxlibc/stdlib.h>
-#include <fxlibc/string.h>
-#include <fxlibc/unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 /*
 ** The calloc() function allocates memory for an array of nmemb elements of size
diff --git a/src/libc/stdlib/reallocarray.c b/src/libc/stdlib/reallocarray.c
index 4b9e552..493e996 100644
--- a/src/libc/stdlib/reallocarray.c
+++ b/src/libc/stdlib/reallocarray.c
@@ -1,4 +1,4 @@
-#include <fxlibc/stdlib.h>
+#include <stdlib.h>
 
 /*
 ** The reallocarray() function changes the size of the memory block pointed to
diff --git a/src/libc/stdlib/target/vhex-sh/free.S b/src/libc/stdlib/target/vhex-sh/free.S
index 3fb88ab..ed8aad4 100644
--- a/src/libc/stdlib/target/vhex-sh/free.S
+++ b/src/libc/stdlib/target/vhex-sh/free.S
@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd_32.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_free
 .type	_free, @function
diff --git a/src/libc/stdlib/target/vhex-sh/malloc.S b/src/libc/stdlib/target/vhex-sh/malloc.S
index 05ef3a3..bab6574 100644
--- a/src/libc/stdlib/target/vhex-sh/malloc.S
+++ b/src/libc/stdlib/target/vhex-sh/malloc.S
@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd_32.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_malloc
 .type	_malloc, @function
diff --git a/src/libc/stdlib/target/vhex-sh/realloc.S b/src/libc/stdlib/target/vhex-sh/realloc.S
index 6666240..aaa7afb 100644
--- a/src/libc/stdlib/target/vhex-sh/realloc.S
+++ b/src/libc/stdlib/target/vhex-sh/realloc.S
@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd_32.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_realloc
 .type	_realloc, @function
diff --git a/src/libc/string/memcpy.c b/src/libc/string/memcpy.c
index 03811d2..d7236b7 100644
--- a/src/libc/string/memcpy.c
+++ b/src/libc/string/memcpy.c
@@ -1,4 +1,5 @@
-#include <fxlibc/string.h>
+#include <string.h>
+#include <stdint.h>
 
 /*
 ** The memcpy() function copies n bytes from memory area src to memory area dest.
diff --git a/src/libc/string/memset.c b/src/libc/string/memset.c
index b7d3b21..58cc851 100644
--- a/src/libc/string/memset.c
+++ b/src/libc/string/memset.c
@@ -1,4 +1,5 @@
-#include <fxlibc/string.h>
+#include <string.h>
+#include <stdint.h>
 
 /*
 ** The  memset()  function fills the first n bytes of the memory area pointed to
diff --git a/src/libc/string/strcat.c b/src/libc/string/strcat.c
index ee31373..8bf00c8 100644
--- a/src/libc/string/strcat.c
+++ b/src/libc/string/strcat.c
@@ -1,4 +1,4 @@
-#include <fxlibc/string.h>
+#include <string.h>
 
 /*
 ** The  strcat()  function  appends  the src string to the dest string,
diff --git a/src/libc/string/strchr.c b/src/libc/string/strchr.c
index 8aeab9e..4d4af8a 100644
--- a/src/libc/string/strchr.c
+++ b/src/libc/string/strchr.c
@@ -1,4 +1,4 @@
-#include <fxlibc/string.h>
+#include <string.h>
 
 /*
 ** The strchr() function returns a pointer to the first occurrence of the
diff --git a/src/libc/string/strcmp.c b/src/libc/string/strcmp.c
index f64cbaf..7fae004 100644
--- a/src/libc/string/strcmp.c
+++ b/src/libc/string/strcmp.c
@@ -1,4 +1,4 @@
-#include <fxlibc/string.h>
+#include <string.h>
 
 /*
 ** The strcmp() function compares the two strings s1 and s2. The locale is not
diff --git a/src/libc/string/strcpy.c b/src/libc/string/strcpy.c
index 02e1c57..0a03980 100644
--- a/src/libc/string/strcpy.c
+++ b/src/libc/string/strcpy.c
@@ -1,4 +1,4 @@
-#include <fxlibc/string.h>
+#include <string.h>
 
 /*
 ** The  strcpy() function copies the string pointed to by src, including the
diff --git a/src/libc/string/strdup.c b/src/libc/string/strdup.c
index 2538aa9..2e532c6 100644
--- a/src/libc/string/strdup.c
+++ b/src/libc/string/strdup.c
@@ -1,5 +1,5 @@
-#include <fxlibc/string.h>
-#include <fxlibc/stdlib.h>
+#include <string.h>
+#include <stdlib.h>
 
 /*
 ** The  strdup()  function  returns a pointer to a new string which is a
diff --git a/src/libc/string/strlen.c b/src/libc/string/strlen.c
index 503d678..718ddc2 100644
--- a/src/libc/string/strlen.c
+++ b/src/libc/string/strlen.c
@@ -1,4 +1,4 @@
-#include <fxlibc/string.h>
+#include <string.h>
 
 /*
 ** The  strlen() function calculates the length of the string pointed to by s,
diff --git a/src/libc/threads/mutex.c b/src/libc/threads/mutex.c
index 9748729..e1b71ff 100644
--- a/src/libc/threads/mutex.c
+++ b/src/libc/threads/mutex.c
@@ -1,5 +1,5 @@
-#include <fxlibc/threads.h>
-#include <fxlibc/unistd.h>
+#include <threads.h>
+#include <unistd.h>
 
 // Creates a new mutex object with type __TYPE.
 // @note: If successful the new object is pointed by __MUTEX.
diff --git a/src/posix/fcntl/target/vhex-sh/open.S b/src/posix/fcntl/target/vhex-sh/open.S
index f812973..e0fc4e3 100644
--- a/src/posix/fcntl/target/vhex-sh/open.S
+++ b/src/posix/fcntl/target/vhex-sh/open.S
@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd_32.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_open
 .type	_open, @function
diff --git a/src/posix/sys/wait/target/vhex-sh/wait.S b/src/posix/sys/wait/target/vhex-sh/wait.S
index 5102832..7e5fa49 100644
--- a/src/posix/sys/wait/target/vhex-sh/wait.S
+++ b/src/posix/sys/wait/target/vhex-sh/wait.S
@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_wait
 .type	_wait, @function
diff --git a/src/posix/sys/wait/target/vhex-sh/waitpid.S b/src/posix/sys/wait/target/vhex-sh/waitpid.S
index 2b6eb2c..f55b3e6 100644
--- a/src/posix/sys/wait/target/vhex-sh/waitpid.S
+++ b/src/posix/sys/wait/target/vhex-sh/waitpid.S
@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_waitpid
 .type	_waitpid, @function
diff --git a/src/posix/unistd/target/casiowin-fx/close.S b/src/posix/unistd/target/casiowin-fx/close.S
index 7d99554..ba36eae 100644
--- a/src/posix/unistd/target/casiowin-fx/close.S
+++ b/src/posix/unistd/target/casiowin-fx/close.S
@@ -1,6 +1,6 @@
 #ifdef __SUPPORT_CASIO_ABI_FX9860G
-#include <fxlibc/asm/unistd_32.h>
-#include <fxlibc/asm-casio/__trapa.h>
+#include <bits/unistd_32.h>
+#include <bits/__trapa.h>
 .text
 .global	_close
 .type	_close, @function
diff --git a/src/posix/unistd/target/vhex-sh/close.S b/src/posix/unistd/target/vhex-sh/close.S
index 12a3b59..977f179 100644
--- a/src/posix/unistd/target/vhex-sh/close.S
+++ b/src/posix/unistd/target/vhex-sh/close.S
@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_close
 .type	_close, @function
diff --git a/src/posix/unistd/target/vhex-sh/fork_execve.S b/src/posix/unistd/target/vhex-sh/fork_execve.S
index 7abbfa1..0b903f0 100644
--- a/src/posix/unistd/target/vhex-sh/fork_execve.S
+++ b/src/posix/unistd/target/vhex-sh/fork_execve.S
@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_fork_execve
 .type	_fork_execve, @function
diff --git a/src/posix/unistd/target/vhex-sh/getpgid.S b/src/posix/unistd/target/vhex-sh/getpgid.S
index 2b36aa0..d5beff7 100644
--- a/src/posix/unistd/target/vhex-sh/getpgid.S
+++ b/src/posix/unistd/target/vhex-sh/getpgid.S
@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_getpgid
 .type	_getpgid, @function
diff --git a/src/posix/unistd/target/vhex-sh/getpid.S b/src/posix/unistd/target/vhex-sh/getpid.S
index 0fd0c43..d19131f 100644
--- a/src/posix/unistd/target/vhex-sh/getpid.S
+++ b/src/posix/unistd/target/vhex-sh/getpid.S
@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_getpid
 .type	_getpid, @function
diff --git a/src/posix/unistd/target/vhex-sh/getppid.S b/src/posix/unistd/target/vhex-sh/getppid.S
index 6b03a69..5fb352f 100644
--- a/src/posix/unistd/target/vhex-sh/getppid.S
+++ b/src/posix/unistd/target/vhex-sh/getppid.S
@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_getppid
 .type	_getppid, @function
diff --git a/src/posix/unistd/target/vhex-sh/lseek.S b/src/posix/unistd/target/vhex-sh/lseek.S
index de8da0a..65b80ae 100644
--- a/src/posix/unistd/target/vhex-sh/lseek.S
+++ b/src/posix/unistd/target/vhex-sh/lseek.S
@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_lseek
 .type	_lseek, @function
diff --git a/src/posix/unistd/target/vhex-sh/read.S b/src/posix/unistd/target/vhex-sh/read.S
index a5ab21c..d2518b3 100644
--- a/src/posix/unistd/target/vhex-sh/read.S
+++ b/src/posix/unistd/target/vhex-sh/read.S
@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_read
 .type	_read, @function
diff --git a/src/posix/unistd/target/vhex-sh/setpgid.S b/src/posix/unistd/target/vhex-sh/setpgid.S
index a4c1a50..6ffb99b 100644
--- a/src/posix/unistd/target/vhex-sh/setpgid.S
+++ b/src/posix/unistd/target/vhex-sh/setpgid.S
@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_setpgid
 .type	_setpgid, @function
diff --git a/src/posix/unistd/target/vhex-sh/write.S b/src/posix/unistd/target/vhex-sh/write.S
index 20bf650..c6f6992 100644
--- a/src/posix/unistd/target/vhex-sh/write.S
+++ b/src/posix/unistd/target/vhex-sh/write.S
@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_write
 .type	_write, @function