Changes to support xos being a subtree of httpserv
Adding missing headers to master include
Merge commit '970ae4edd843122aca677a863e3f1ecaae0f8add'