Merge "clean-up libutils includes"