only one header per package, not one per service -- fixes #4260