Bug 17569: add namespaces to work with gcc-4.7