0023915: Redundant header inclusion