Revert "Split off hash.h from util.h"

This reverts commit 436cb3656175d4a48cf8b397a42d9cd74194e280.

Conflicts:
	src/hash.h