WHISTLE-1510: update whistle makefile, export unused function, and get rid of unused var warning