After Wilson & Sereno, 1998, and Wilson, 2002

<==o †Sauropoda Marsh, 1878b
   |-- †Vulcanodon karibaenis Raath, 1972 [paraphyletic Vulcanodontidae]
   `--o †Eusauropoda
      |-- †Shunosaurus lii Dong, Zhou & Zhang, 1983
      `--+-- †Barapasaurus tagorei Jain, Kutty, Roy-Chowdhury & Chatterjee, 1975 [paraphyletic Vulcanodontidae]
         `--+-- †Patagosaurus fariasi Bonaparte, 1979b [paraphyletic Cetiosauridae]
            `--+--o †Mamenchisauridae
               |  |--o †Omeisaurus Young, 1939
               |  |  |-- †O. junghsiensis Young, 1939
               |  |  |-- †O. changshouensis Young, 1958a
               |  |  |-- †O. fuxiensis Hou, Chao & Chu, 1983
               |  |  `-- †O. tianfuensis He, Li, Cai & Gao, 1984
               |  `--o †Mamenchisaurus Young, 1954 [ [Zigongosaurus Hou, Chao & Chu, 1976; “Moshisaurus” Hisa, 1985 (nomen nudum)]
               |     |-- †M. constractus Young, 1954
               |     |-- †M. hochuanensis Young & Chao, 1972
               |     |-- †M. fuxiensis (Hou, Zhao & Chu, 1976) [Zigongosaurus fuxiensis Hou, Chao & Chu, 1976]
               |     |?- ?†M. sinocanadorum D. Russell & Zheng, 1994
               |     |-- †M. anyuensis He, Yang, Cai, Li & Liu, 1996
               |     |-- †M. youngi Pi, Quyang & Ye, 1996
               |     `-- †M. jingyanensis Zhang & Li in Zhang & Chen, 1996
               `--+-- †Jobaria tiquidensis Sereno et al., 1999
                  `--o †Neosauropoda Bonaparte, 1986b
                     |-- †Diplodocoidea sensu Wilson & Sereno, 1998 and Wilson, 2002 [Diplodocimorpha Upchurch, 1998]
                     `-- †Macronaria Wilson & Sereno, 1998

Sauropods not treated by Wilson, 2002:

Gongxianosaurus shibeiensis He, Wang, Liu, Zhou, Liu, Cai, & Dai, 1998
    †Isanosaurus attavipachi Buffetaut et al., 2000 
    †Kotasaurus yamanpalliensis Yadagiri, 1988 [paraphyletic Vulcanodontidae]Ohmdenosaurus liasicus Wild, 1978 [paraphyletic Vulcanodontidae]Zizhongosaurus chuanchengensis Dong, Zhou & Zhang, 1983 [paraphyletic Vulcanodontidae]Sanpasaurus yaoi Young, 1946 in partimAustrosaurus mckillopi Longman, 1933
    †"Morosaurus" agilis Marsh, 1889a
    †Protognathosaurus oxyodon (Zhang, 1988)
    †Amygdalodon patagonicus Cabrera, 1947 [paraphyletic Cetiosauridae]Volkheimeria chubutensis Bonaparte, 1979b [paraphyletic Cetiosauridae]Cetiosaurus Owen, 1841 [paraphyletic Cetiosauridae]C. medius Owen, 1842b
        †C. oxoniensis Phillips, 1871
        †C. mogrebiensis Lapparent, 1955
    †Rhoetosaurus brownei Longman, 1925

Sauropoda incertae sedis:

Aepysaurus elephantinus Gervais, 1853
    †Algoasaurus bauri Broom, 1904
    †Asiatosaurus kwangshiensis Hou, Yeh & Zhao, 1975
    †Asiatosaurus mongoliensis Osborn, 1924c
    †Camplodoniscus ameghinoi (Huene, 1929a) Kuhn, 1961 [Campylodon ameghinoi Huene, 1929a (preoccupied)]
    †Cardiodon rugulosus Owen, 1845
    †Chiayusaurus lacustris Bohlin, 1953
    †Clasmodosaurus spatula Ameghino, 1899
    †Gigantosaurus megalonyx Seeley, 1869
    †Iguanodon praecusor Sauvage, 1876a
    †KunmingosaurusLosillasaurus giganteusMongolosaurus haplodon Gilmore, 1933b
    †Morinosaurus typus Sauvage, 1874
    †MoshisaurusNegmetosaurus pachi Dong, 1977
    †Neosodon Moussaye, 1885
    †"Pleurocoelus" altusQinlingosaurus
    †"Titanosaurus" fallotiTitanosaurus montanus Marsh, 1877a [Atlantosaurus Marsh, 1877a]
    †"Titanosaurus" rahioliensis

  Tendaguriidae Bonaparte, Heinrich & Wild, 2000
    †Tendaguria

Reference(s):