Revert pimpls for now

This reverts some changes (that made it in via another PR) that presumably implement the pimpl idiom. We decided to discuss this matter separately, until then these "controversial" changes shouldn't be applied to the master.

Also some header-includes were in the wrong order, but that's minor.