Tighten up the includes in the bindings

I've noticed there are places I have a #include of a file (particularly in a header file) which isn't used directly by that header, but is used in the corresponding cxx file, or in another file that #includes this header.   Lets clean that up - should make one commit that gets them all, if possible.