same sense of fixes (introducing a separate named namespace; avoid 'using namespace' in the header file).