Remove 2 un-necessary includes from C++03 era