THRIFT-1552 Thrift (cpp) include files shouldn't require adding "thrift" to the compilers include path. roger: some additional fixes