Fixing unused variable warning
Fixing messed up include directives