S25 Fix xmod/libelf related build failures