Doesn't fix build yet due to use of unconventional object file extensions (which shouldn't matter but do).