Some progress on improving c++ standalone namespace handling - hack
added to rename clock to clock_