Try to pollute global namespace less

hoping to fix build