continued purging of values.h for Mac compatibility