Src headers update and removed xjc