WIP
Improved inclusion recompile