Removed duplicate headers imports

Review: https://reviews.apache.org/r/25042