Add non-member swap
Remove unnecessary include