made arch-indep include files more general