Remove useless variables
Adapt include
Adapt include