[PATCH] Improve dependency checking on builds