Fixed header namespace issue

Last PR on headers for a while, sorry I got them in 3-4 PRs instead of 1.