This patch has bitrotted, presumably after the other JSON patchset was
applied. It looks like it's failing in the json header file so it may
be as simple as additional functions added on nearby lines.
Please rebase. Reminder, it's the last week of the commitfest so time
is of the essence....
