Final cleanup on headers.