This was also causing a compilation error with GCC 4.8. This CL also removes basictypes.h.orig accidentally added in the previous revision.