Prevent namespace pollution, add static for internal functions
2 files changed