fixed missing include
silence some warnings
Merge branch 'windows_fixes' into snore