change: dont pollute the namespace in headers