Use more proper detection of some functions.
Use more proper detection of some functions.

Open343/pkg,khorben/pkg,skoef/pkg,junovitch/pkg,junovitch/pkg,khorben/pkg,khorben/pkg,en90/pkg,skoef/pkg,Open343/pkg,en90/pkg