GH919: Fix wrappers for two headers