A bit more cleanup, but totally broken atm.
Autogenerated includes now working.