I always classify magic as totally seperate and mana-based from stuff like Psionics.

... Honestly, psychic powers and espers always seemed kind of out of place in Fantasy to me. ^^; Unless it's, say, science fantasy or something like Raildex, which is a very specific type of Urban Fantasy.

Also spirit/chi seemed to be something else most of the time to me too. ^^;