You can lose the moons from that list easily enough--"Everything in hydrostatic equilibrium smaller than a brown dwarf and which is orbiting the system's primary, not another body". Problem is, it's still way too wide a definition--it includes the asteroids Ceres and Pallas, for instance, which are absolutely tiny.