Make more param/member refs const
Clean up include order and 'using's