Update the windows RTS files and consolidate the headers

No need to have two sets of headers if we move the includes to the
C file where they belong.
Merge pull request #1237 from melted/rts_update

Update the windows RTS files and consolidate the headers