Merge "Remove unused includes"