fix: Amend external types declaration, and trailing ones

fix: Amend external types declaration, and trailing ones #1838