Makefile changes and defines inside source files to distinquish hash implementations