Patched Q6 test building, had wrong ARCH_INCPATH