Added include paths for Fedora 17.
Merge remote-tracking branch 'origin/master'