Added std prefix to avoid some eclipse wrong reference message.
Some include cleanup.