I updated it a little - likely.h wasn't being installed, and some C files
still needed util.h added to them.  Looks fine now.