update include directives
Format code
Merge pull request #4 from kmammou/master

Update include directives and format code