Do these headers need to appear in avocet modules? /cc @nicolaasmatthijs