Log Message: Make use of the new USE_DIRS variable, instead of directly depending on the *-dirs packages.