Include dependencies, fix tabs