Merge "Add guards to prevent typedefs when C++11 is available."