[BUILD,INTERNAL] fixed win linker error when linking libSuperHirn

 * some more cleanups of SuperHirn code