Patch 3.10.5 Kill a bunch of forward declarations that are declared twice