add missing namespace, fix include guards