Remove the redundant header imports