include: sync recent header changes