Discovered while making a test application that some of the header fi…

[russell-taylor]

…les required others to be inluded, so moving those includes inside the files.

Also adding explicit namespace rather than "using" in those files.