Merge "Added missing header to window.h"