g2: clean up compile/link errors