build: Fix more builds regressions caused by deleting so much code.
It would compile with a "dirty" build directory but not a clean one.