Include/lib dirs fixed, Prefix matching changed