Fix include path and name