Merge necessary code from fifo into message buffer, remove old fifo
source files