The mole is the amount of substance of a system which contains as many elementary entities as there are atoms in 0.012 kilogram of carbon-12.
When the mole is used, the elementary entities must be specified and may be atoms, molecules, ions, electrons, other particles, or specified groups of particles.
(Addendum in 1980) In this definition it is understood that unbound atoms of carbon 12, at rest and in their ground state,.
“The mole, unit of amount of substance of a specified elementary entity, which may be an atom, molecule, ion, electron, any other particle or a specified group of such particles, is such that the Avogadro constant is equal to exactly 6.022 141 79 x 1023 per mole.
A note should accompany the new definition to explain that the molar mass of 12C will be an experimental quantity, with a relative measurement uncertainty of about 1.4 x 10-9.”
I don't suppose there is much sympathy for the view that the Mole is a historical curiosity (like the Furlong and Morgan) that could be replaced by simple counts of the entities involved ?