improve includes of headers

Using namespaces should not be in headers, and thus "std::vector" should be used instead of "vector".