moved arch depend. include files around