include/irc: re-order struct definitions