diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53664d1..42ad3d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,10 +17,12 @@ if(FXLIBC_TARGET STREQUAL vhex-sh)
   add_definitions(-D__SUPPORT_VHEX_KERNEL)
 endif()
 
-if(FXLIB_TARGET STREQUAL vhex-x86)
+if(FXLIBC_TARGET STREQUAL vhex-x86)
   list(APPEND TARGET_FOLDERS vhex-generic x86-generic)
   set(FXLIBC_ARCH x86)
   add_definitions(-D__SUPPORT_VHEX_KERNEL)
+  # TODO: Maybe add -nostdinc (but that removes compiler-provided headers like
+  # <stddef.h>), or use another compiler than the system one?
 endif()
 
 if(FXLIBC_TARGET STREQUAL casiowin-fx)
diff --git a/include/target/casiowin-cg/bits/unistd_32.h b/include/target/casiowin-cg/bits/asm/unistd_32.h
similarity index 100%
rename from include/target/casiowin-cg/bits/unistd_32.h
rename to include/target/casiowin-cg/bits/asm/unistd_32.h
diff --git a/include/target/casiowin-fx/bits/unistd_32.h b/include/target/casiowin-fx/bits/asm/unistd_32.h
similarity index 100%
rename from include/target/casiowin-fx/bits/unistd_32.h
rename to include/target/casiowin-fx/bits/asm/unistd_32.h
diff --git a/src/posix/unistd/target/casiowin-fx/close.S b/src/posix/unistd/target/casiowin-fx/close.S
index 7dd04d1..f6f1fab 100644
--- a/src/posix/unistd/target/casiowin-fx/close.S
+++ b/src/posix/unistd/target/casiowin-fx/close.S
@@ -1,4 +1,4 @@
-#include <bits/unistd_32.h>
+#include <bits/asm/unistd_32.h>
 #include <bits/trapa.h>
 .text
 .global	_close