CXX-266 ensure basic.h is included where needed