Fix include paths