Make declarations in header match implemenations

Fixes #2789