Merge "Remove unused include and headers"