Adding include and fixing linting issues