moved some arch dependant headers around