Include clean up

Makes parsing and analysis easier
Clean up
Ops
Remove unnecessary algorithm include
Forward declaration