Fix use in include
Cleanup