Minor updates for sort-of uapi header detection and minor Makefile change to allow the annotations file to be turned on/off.