Fixed statement
Split up window.h and display.h