updated includes to reflect reorganized jame engine structure