Latest Versions of headers

Previously comitted the non-lates version of the header files. Here are
the latest