Fix the Windows window size and simplify the headers

Remove mass includes from the headers and fix the window size in
Windows to 512 x 512