After Damiani, 2001, and Steyer, 2003

<==o †Mastodonsauroidea Lydekker, 1885b sensu Damiani, 2001 [Capitosauria Yates & Warren, 2000] 
   |?- †Sclerothorax hypselonotus v. Huene, 1932 [Sclerothoracidae v. Huene, 1932]
   |--o †Benthosuchus Efremov, 1937 [Benthosaurus Efremov, 1929; Rasaurus Kuzmin; Parabenthosuchus Ochev; Wetlugasaurus Ryabinin, 1930]
   |  |-- †B. bashkiricus Otschev [Ochev], 1966
   |  |-- †B. bystrowi Getmanov, 1989
   |  |-- †B. uralensis (Otschev [Ochev], 1958 [1966?]) [Parabenthosuchus uralensis Ochev, 1958 [1966?]]
   |  |-- †B. korobkovi Ivachnenko, 1972
   |  `-- †B. sushkini (Efremov, 1929)
   `--+--o †Heylerosauridae Shishkin, 1980 [Eucyclotosauridae Morales & Kamphausen]
      |  |-- †Odenwaldia heidelbergensis Morales & Kamphausen, 1984
      |  `--+-- †Yuanansuchus laticeps Liu & Wang, 2005; Trias. EAs.
      |     `--+-- †Quasicyclotosaurus campi Schoch, 2000
      |        `--o †Eocyclotosaurus Ortlam, 1970 [taxonomic history]
      |           |-- †E. woschmidti Ortlam, 1970 [taxonomic history]
      |           |-- †E. lehmani (Heyler, 1969) Kamphausen & Morales, 1981 [taxonomic history]
      |           `-- †E. wellesi Schoch, 2000 [taxonomic history]
      `--o †Mastodonsauridae Lydekker, 1885b [Synonyms]
         |--o †Wetlugasaurus Ryabinin, 1930
         |  |-- †W. angustifrons Ryabinin, 1930
         |  |-- †W. groenlandicus Säve-Söderbergh, 1935
         |  |-- †W. malachovi Novikov, 1990
         |  `-- †W. samarensis Sennikov, 1981
         `--+--o †Watsonisuchus Ochev, 1966
            |  |-- †W. gunganj (Warren, 1980) Damiani, 2001 [taxonomic history]
            |  `--+-- †W. madagascariensis (Lehman, 1961) Steyer, 2003 [taxonomic history]
            |     `--+-- †W. aliciae (Warren & Hutchinson, 1988) Damiani, 2001 [taxonomic history]
            |        `-- †W. magnus (Watson, 1962) Ochev, 1966 [taxonomic history]
            `--+--o †Parotosuchus Otschev & Shishkin, 1968 [taxonomic history]
               |  |-- †P. haughtoni (Broili & Schröder, 1937); Damiani, 2001 [taxonomic history]
               |  |-- †P. helgolandicus (Schröder, 1913) Chernin, 1978 [taxonomic history]
               |  |-- †P. nasutus (Meyer, 1858) Chernin, 1978 [type] [taxonomic history]
               |  |-- †P. bogdoanus (Woodward, 1932)
               |  |-- †P. oremburgensis (Konzhukova, 1965) Ochev & Shishkin, 1968 [taxonomic history]
               |  |-- †P. orientalis (Otschev [Ochev], 1966) Ochev & Shishkin, 1968 [taxonomic history]
               |  |-- †P. panteleevi (Otschev [Ochev], 1966) Ochev & Shishkin, 1968 [taxonomic history]
               |  |-- †P. sequester Lozovsky & Shishkin, 1974 [taxonomic history]
               |  |-- †P. komiensis Novikov, 1986 [taxonomic history]
               |  |-- †P. speleus Shishkin & Sulej, 2009
               |  `-- †P. ptaszynskii Sulej & Nied´zwiedzki, 2013
               `--+--o †Cherninia Damiani, 2001 [Parotosaurus Jaekel; Parotosuchus Ochev & Shishkin;]
                  |  |-- †C. denwai (Mukherjee & Sengupta, 1998) Damiani, 2001
                  |  `-- †C. megarhina (Chernin & Cosgriff, 1975) Damiani, 2001
                  `--+--o †Eryosuchus Otschev [Ochev], 1966 [Parotosaurus]
                     |  |-- †E. pronus (Howie, 1970) Damiani, 2001
                     |  |-- †E. rajareddyi (Roy-Chowdhury [Roychowdhury], 1970) Damiani, 2001 ["Parotosuchus" rajareddyi; Stanocephalosaurus rajareddyi]
                     |  `-- †E. tverdochlebovi Otschev [Ochev], 1966 [incl. E. garjainovi Otschev [Ochev], 1966]
                     `--+?- †Jammerbergia formops Damiani & Hancox, 2003
                        |--o †Paracyclotosaurus Watson, 1958
                        |  |-- †P. crookshanki (Mukherjee & Sengupta, 1998) Damiani, 2001
                        |  |-- †P. davidi Watson, 1958
                        |  `-- †P. morganorum Damiani & Hancox, 2003 [P. morgani Hancox & Rubidge, 1997 (nomen nudum); P. morgani Hancox, 2000 (nomen nudum)]
                        `--o "Stenotosauridae"
                           |--o †Stenotosaurus Romer, 1947 [Capitosaurus Münster; Cyclotosaurus Fraas; Procyclotosaurus Watson; Parotosuchus Ochev & Shishkin]
                           |  |-- †S. gracilis Kamphausen, 1983
                           |  |-- †S. semiclausus (Swinton, 1927) Romer, 1947
                           |  `-- †S. stantonensis (Woodward, 1904) Kamphausen, 1983
                           `--+?- †Xenotosaurus africanus (Broom, 1909) Morales & Shishkin, 2002 [taxonomic history]
                              |-- †Wellesaurus peabodyi (Welles & Cosgriff, 1965) Lehman, 1971 [Parotosaurus peabodyi (Welles & Cosgriff, 1965]
                              `--+--o †Mastodontosaurus Jaeger, 1828 [taxonomic history]
                                 |  |-- †M. cappelensis Wepfer, 1923b [taxonomic history]
                                 |  |-- †M. giganteus [taxonomic history]
                                 |  `-- †M. torvus Konzhukova, 1955 [taxonomic history]
                                 `--+--o †Tatrasaurus Marya´nska & Shishkin, 1996
                                    |  |-- †T. kulczyckii Marya´nska & Shishkin, 1996
                                    |  `-- †T. wildi (Schoch, 1997) Damiani, 2001
                                    `--o †Cyclotosaurus Fraas, 1889 [taxonomic history]
                                       |-- †C. ebrachensis Kuhn, 1932 [taxonomic history]
                                       |-- †C. hemprichi Kuhn, 1942 [taxonomic history]
                                       |-- †C. papilio Wepfer, 1923a [taxonomic history]
                                       |-- †C. robustus (Quenstedt, 1850) Fraas, 1889 [taxonomic history]
                                       `-- †C. posthumus Fraas, 1913 [taxonomic history]


Mastodonsauridae incertae sedis:Subcyclotosaurus brookvalensis (Watson, 1958) [Parotosuchus  brookvalensis]
    †Promastodonsaurus bellmani (Bonaparte, 1963)
    †Bukobaja enigmatica (Otschev, 1966)
    †Komatosuchus chalyshevi (Novikov & Shishkin, 1992)
    †Bulgosuchus gargantua (Damiani, 1999)


Mastodonsauridae indeterminate:Capitosaurus arenaceus Münster, 1836
    †Mastodonsaurus vaslenensis Meyer, 1855
    †Labyrinthodon furstenberganus Meyer, 1855
    †Labyrinthodon lavisi Seeley, 1876
    †Capitosaurus polaris Wiman, 1915
    †Cyclotosaurus spitzbergensis Wiman, 1915
    †Kestrosaurus dreyeri Haughton, 1925
    †Capitosaurus bogdoanus Woodward, in Zittel, 1932 [Parotosuchus bogdoanus (Woodward)]
    †Stanocephalosaurus birdi (Brown, 1933) [Parotosuchus birdi]
    †Parotosuchus dirus (Chernin, 1978)


Mastodonsauroidea indeterminate:Labyrinthodon pachygnathus (Owen, 1842b)
    †Mentosaurus waltheri (Roepke, 1930)
    †Cyclotosaurus mechernichensis (Jux & Pflug, 1958)
    †Yarengia perplexa Shishkin, 1960 [Yarengiidae]Abiadisaurus witteni (Warren et al., 1998)


Taxa not recognized by Damiani, 2001:Angusaurus Getmanov, 1989
        †A. dentatus Getmanov, 1989
        †A. succedaneus Getmanov, 1989
        †A. tsylmensis Novikov, 1990
    †Cyclotosaurus carinidensEryosuchus antiquus Otschev [Ochev], 1966 
    †GondwanosaurusMeyerosuchus [a heylerosaurid?]
    †Negevodus ramonensis Mazin, 1986
    †PachygoniaParotosuchus croockshanki [Sengupta, 2003]
    †Promastodonsaurus bellmanniSassenisaurusTrematotegmen otschevi Getmanov, 1989
    †VolgasaurusVolgasuchusVyborosaurus mirus Novikov, 1990

Reference(s):