diff --git a/user/apps/helloworld/compile.sh b/user/apps/helloworld/compile.sh
index 4033297..1a66f8c 100644
--- a/user/apps/helloworld/compile.sh
+++ b/user/apps/helloworld/compile.sh
@@ -1,15 +1,28 @@
-GCC_INCLUDES=$(gcc -print-file-name=include)
-SYS_INCLUDES=/usr/include
-
 if [ "$KARCH" = "aarch64" ]; then
     CC="aarch64-linux-gnu-gcc"
     ARCH_FLAGS="-march=armv8-a+nosimd -mabi=lp64"
+    SYS_INCLUDES="/usr/include /usr/aarch64-linux-gnu/include"
 elif [ "$KARCH" = "x86_64" ]; then
-    CC="x86_64-linux-gnu-gcc"
+    CC="gcc"
     ARCH_FLAGS="-m64 -mno-mmx -mno-avx"
+    SYS_INCLUDES="/usr/include /usr/include/x86_64-linux-gnu"
 else
     echo "Error: Unsupported KARCH: $KARCH"
     exit 1
 fi
 
-$CC -w -static -D__NO_INLINE__ -O3 $ARCH_FLAGS -fno-stack-protector -fno-inline -fno-inline-small-functions -fno-indirect-inlining -fno-builtin -fcompare-debug-second -nostdlib -nostdinc helloworld.c -Wl,--gc-sections -L../../libxunil/target/$KARCH-unknown-none/release -l:libxunil.a -I../../libxunil/include -I"$GCC_INCLUDES" -I"$SYS_INCLUDES" -o ../../../assets/$KARCH/helloworld.elf
+GCC_INCLUDES=$($CC -print-file-name=include)
+INCLUDE_FLAGS="-I../../libxunil/include -I$GCC_INCLUDES"
+for dir in $SYS_INCLUDES; do
+    INCLUDE_FLAGS="$INCLUDE_FLAGS -I$dir"
+done
+
+$CC -w -static -D__NO_INLINE__ -O3 $ARCH_FLAGS \
+    -fno-stack-protector -fno-inline -fno-inline-small-functions \
+    -fno-indirect-inlining -fno-builtin -fcompare-debug-second \
+    -nostdlib -nostdinc \
+    $INCLUDE_FLAGS \
+    helloworld.c \
+    -Wl,--gc-sections \
+    -L../../libxunil/target/$KARCH-unknown-none/release -l:libxunil.a \
+    -o ../../../assets/$KARCH/helloworld.elf