Consistant header use

Fixes #174