Header refactoring: move util.h out of the catchall
11 files changed