Fix include warnings