cleanup of some Trajectory using code

Gerhard Ravenrequested to merge
fixup-trajectory-usage into master
  • include the correct header files
  • remove old WIN32 specific #ifdef
  • add final where appropriate
  • remove redundant destructor declarations

Merge request reports