COMP: Fix compilation linkage errors.