Added header file directories

There was a conflict when I tried to pull from your branch. I did a three-way merging. Hope I didn't accidentally ignore some of your changes.