Add explicit extra-{lib,include}-dirs