Fix util headers

Cleanup of the util headers