Further fix for arch.h removal