Fix linker some more. This is a second part of commit
6d983a, which got lost by mistake.