volk: header fixes from maint