fix remove_markup bug
added missing forward declarations