Cleanup: Fix up custom dependencies for Makefiles