Revert "Remove a couple of duplicate typedefs."

The symbols are duplicates but this matches Mesa's headers and is what consumers expect because of that.

With this it is possible again to build Plasma Frameworks. Likely the same holds for Kodi.

Fixes #194 (closed).

This reverts commit 012fe39e.