Removed two c++11-only occurrences. Added missing includes