Included required headers for std::swap

Included both headers for C++98 and C++11 support