Fix missing includes
Fix includes for Windows crosscompilation
The None hack is only for *nix