Change header order to be able to compile on windows
Update Windows project files