Fix some include ordering
Convert more stuff to std:: now we've fixed Doxygen
Merge pull request #464 from peternewman/e1.37-2

More misc tidying