[Matahari] [PATCH 3/3] Fix most compilation for windows