rearrange gtest headers a bit to make porting Makefile.orig easier