Utility fixes

This fixes a handful of includes to reference the headers in utility.  On a clean checkout of configurable compiles fail because headers have been moved down.