The Witch seemed quite friendly. She was kind enough to leave Merida a message about how much time they have until the spell is permanent and told her how to break the spell. She's not really a villain, she's more like the sea witch from the original Little Mermaid, who wasn't evil but more of a plot device to get the story rolling for the main character. Mor'du, while not as much of a villain as Jafar or Ursula, is still a villain. He doesn't really have a diabolical plan but neither did the Siamese Cats from Lady and The Tramp or Man and their hunting dogs from Bambi. They're still considered villains, so Mor'du I think fits into the same category as them.

He's an antagonist more than a villain.

Brave has a villain?? Just kidding, but both of them had a little screen time I don't even remember them.