Better handling of include paths for header files.