Added keyboard & joystick input handling; cleared redundant include statements