diff --git a/cross/wrappers/x86_64-jehanne-g++ b/cross/wrappers/x86_64-jehanne-g++
index e933e47..83101e1 100755
--- a/cross/wrappers/x86_64-jehanne-g++
+++ b/cross/wrappers/x86_64-jehanne-g++
@@ -13,8 +13,8 @@ echo >> $WRAPPER_LOG
 echo >> $WRAPPER_LOG
 
 if echo $ARGS|grep -e '\.cpp\b' -e '\b\-o\b' -e ' -o ' > /dev/null; then
-	TOINCLUDE="-I$JEHANNE/posix/x86_64-jehanne/include/c++/9.2.0/ -I$JEHANNE/posix/x86_64-jehanne/include/c++/9.2.0/x86_64-jehanne -IJEHANNE/posix/x86_64-jehanne/include/c++/9.2.0/backward/ -I$JEHANNE/posix/lib/gcc/x86_64-jehanne/9.2.0/include -I$JEHANNE/posix/include"
-	TOLINK="-L$JEHANNE/posix/lib -L$JEHANNE/arch/amd64/lib -lstdc++ -lm -lnewlibc -lposix -lc"
+	TOINCLUDE="-isystem$JEHANNE/posix/x86_64-jehanne/include/c++/9.2.0/ -isystem$JEHANNE/posix/x86_64-jehanne/include/c++/9.2.0/x86_64-jehanne -isystem$JEHANNE/posix/x86_64-jehanne/include/c++/9.2.0/backward -isystem$JEHANNE/posix/lib/gcc/x86_64-jehanne/9.2.0/include -isystem$JEHANNE/posix/include"
+	TOLINK="-L$JEHANNE/posix/lib -lstdc++ -lm -lnewlibc -lposix"
 	date --rfc-3339="ns"  |tee -a $WRAPPER_LOG
 	export >> $WRAPPER_LOG
 echo	$WORKING_DIR/cross/posix/bin/x86_64-jehanne-g++ "$@" $TOINCLUDE $TOLINK >> $WRAPPER_LOG
diff --git a/cross/wrappers/x86_64-jehanne-gcc b/cross/wrappers/x86_64-jehanne-gcc
index 73fa14e..f00117f 100755
--- a/cross/wrappers/x86_64-jehanne-gcc
+++ b/cross/wrappers/x86_64-jehanne-gcc
@@ -13,8 +13,8 @@ echo >> $WRAPPER_LOG
 echo >> $WRAPPER_LOG
 
 if echo $ARGS|grep -e '\.c\b' -e '\b\-o\b' -e ' -o ' > /dev/null; then
-	TOINCLUDE="-I$JEHANNE/posix/lib/gcc/x86_64-jehanne/9.2.0/include -I$JEHANNE/posix/include"
-	TOLINK="-L$JEHANNE/posix/lib -L$JEHANNE/arch/amd64/lib -lnewlibc -lposix -lc"
+	TOINCLUDE="-isystem$JEHANNE/posix/lib/gcc/x86_64-jehanne/9.2.0/include -isystem$JEHANNE/posix/include"
+	TOLINK="-L$JEHANNE/posix/lib -lnewlibc -lposix"
 	date --rfc-3339="ns"  |tee -a $WRAPPER_LOG
 	export >> $WRAPPER_LOG
 echo	$WORKING_DIR/cross/posix/bin/x86_64-jehanne-gcc "$@" $TOINCLUDE $TOLINK >> $WRAPPER_LOG
diff --git a/cross/wrappers/x86_64-jehanne-ld b/cross/wrappers/x86_64-jehanne-ld
index d468d60..b2afe80 100755
--- a/cross/wrappers/x86_64-jehanne-ld
+++ b/cross/wrappers/x86_64-jehanne-ld
@@ -13,7 +13,7 @@ echo >> $WRAPPER_LOG
 echo >> $WRAPPER_LOG
 
 if echo $ARGS|grep -e '\b\-o\b' -e ' -o ' > /dev/null; then
-	TOLINK="-L$JEHANNE/posix/lib -L$JEHANNE/arch/amd64/lib -lnewlibc -lposix -lc"
+	TOLINK="-L$JEHANNE/posix/lib -lnewlibc -lposix -lc"
 	date --rfc-3339="ns"  |tee -a $WRAPPER_LOG
 	export >> $WRAPPER_LOG
 echo	$WORKING_DIR/cross/posix/bin/x86_64-jehanne-ld "$@" $TOLINK >> $WRAPPER_LOG