Removing the extra arguments for the hash function and cleaning up the includes in the header files.