Fix Makefiles after r220867.