Fix 'undefined reference' linker errors - part 1