Updates for win32 api to make compile with 2.061, plus imaged updates