Make header self-contained
Merge pull request #295 from tribal-tec/master

Make header self-contained