Amend order of extern files as per #1453