play nicer with the stock Arch header files