Get includes working with schemas

*WIP*

Messed up history, should be fine though.