Simplify header search paths
Merge pull request #39 from puls/master

Simplify header search paths