diff --git a/cross/init.sh b/cross/init.sh
index 0b392ab..fed3edf 100755
--- a/cross/init.sh
+++ b/cross/init.sh
@@ -116,15 +116,15 @@ mkdir -p $GCC_BUILD_DIR
 	( cd gcc && ./contrib/download_prerequisites ) &&
 	( cd gcc/libstdc++-v3 && autoconf -i ) &&
 	cd $GCC_BUILD_DIR &&
-	$WORKING_DIR/src/gcc/configure --target=x86_64-jehanne --prefix=/posix/ --with-sysroot=$JEHANNE --enable-languages=c,c++ --without-isl --disable-nls &&
-	make all-gcc all-target-libgcc && 
+	$WORKING_DIR/src/gcc/configure --target=x86_64-jehanne --prefix=/posix --with-sysroot=$JEHANNE --enable-languages=c,c++ --without-isl --disable-nls &&
+	make CFLAGS_FOR_TARGET="-I$JEHANNE/sys/include/apw" all-gcc all-target-libgcc &&
 	make DESTDIR=$WORKING_DIR/cross install-gcc  install-target-libgcc
 ) >> $LOG 2>&1
 failOnError $? "building gcc"
 echo done.
 
-echo -n Copying GCC includes into $JEHANNE/posix...
-mkdir -p $JEHANNE/posix/lib
-cp -fpr $WORKING_DIR/cross/posix/lib/* $JEHANNE/posix/lib
-cp -fpr $WORKING_DIR/cross/posix/lib/gcc/x86_64-jehanne/9.2.0/include-fixed/* $JEHANNE/posix/lib/gcc/x86_64-jehanne/9.2.0/include/
-echo done.
+## TODO: get a sense of this... shouldn't we do this after GCC compilation?
+#echo -n Copying GCC includes into $JEHANNE/posix...
+#mkdir -p $JEHANNE/posix/lib
+#cp -fpr $WORKING_DIR/cross/posix/lib/* $JEHANNE/posix/lib
+#echo done.
diff --git a/cross/patch/gcc/gcc/config/jehanne.h b/cross/patch/gcc/gcc/config/jehanne.h
index 49162ac..245351b 100644
--- a/cross/patch/gcc/gcc/config/jehanne.h
+++ b/cross/patch/gcc/gcc/config/jehanne.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of Jehanne.
  *
- * Copyright (C) 2016-2019 Giacomo Tesio <giacomo@tesio.it>
+ * Copyright (C) 2016-2020 Giacomo Tesio <giacomo@tesio.it>
  *
  * Jehanne is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,28 +28,16 @@
 
 #undef MD_STARTFILE_PREFIX
 #define MD_STARTFILE_PREFIX "/arch/amd64/lib/"
-/*
-#undef GPLUSPLUS_INCLUDE_DIR
-#define GPLUSPLUS_INCLUDE_DIR "/posix/g++"
 
-#undef GCC_INCLUDE_DIR
-#define GCC_INCLUDE_DIR "/posix/gcc"
-*/
 /* Architecture specific header (u.h) goes here (from config.gcc) */
 #define ARCH_INCLUDE_DIR NATIVE_SYSTEM_HEADER_DIR 
 
-/* The default include dir is /sys/include but... */
+/* The default include dir is /sys/include */
 #define PORTABLE_INCLUDE_DIR "/sys/include"
 
-/* ...we have to wrap libc.h and stdio.h with basic POSIX headers */
-#define BASIC_POSIX_INCLUDE_DIR "/sys/include/apw"
-
 #undef INCLUDE_DEFAULTS
 #define INCLUDE_DEFAULTS				\
   {							\
-    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 1, 0 },	\
-    { GCC_INCLUDE_DIR, "GCC", 0, 0, 1, 0 },		\
-    { BASIC_POSIX_INCLUDE_DIR, 0, 0, 0, 1, 0 },		\
     { PORTABLE_INCLUDE_DIR, 0, 0, 0, 1, 0 },		\
     { ARCH_INCLUDE_DIR, 0, 0, 0, 1, 0 },		\
     { 0, 0, 0, 0, 0, 0 }				\