Merge "Fix include dependencies"