Fix multi window build errors

Inlude missing files and some typos