post-merge windows fixes.
rename of header and native files