Magick is found all over the world. It is a part of Nature and doesn't have an owner.
Witchcraft is a type of magick and witches are those who practice this particular craft. Witchcraft originated in Europe and is a religion in its own, and Wicca took this religion, altered it a bit, and made it "official" about 50 years ago.
Egyptians, Greeks, Native Americans etc did not practice "witchcraft" nor were they called "witches". So witchcraft is magick, but not all magick is called witchcraft nor practised by "witches".
In fact, in the Cherokee religion, magick was "medicine" and those who practised were medicine people. Witches were considered dangerous and some even considered them untrustworthy, because they (to them) had wild power and could not be detected apart from normal everyday people. When "bad medicine" occurred, it was blamed on a witch! Funny no?