This commit also update the internal includes to latest mozilla ones
including the .c{,pp} file updates.

The ldap check is also simplified from 2 check into plain one.