merge DisplayState.h into Controller.h
remove some forward declarations