c++03/11 fixes
headers missing in repo code. do not merge this commit, it is already fixed in ot/develop