And add missing header in one file
To not wrap types anymore, but rather use extension traits for extending all the things.
