moved all #includes and typedefs into display.h