Normalize merge feed for Reedah
Generalizing source subscription type handling. Moving external declarations into .c files and using them only in the type declaration.