Namespacing cleanup (it's bad to do "using namespace" in a header)