Removed useless headers, window class files combined