Updated include-files.

  We prefer to forward-declare classes rather than including
 header-files willy-nilly.