Remove old includes created by wrong merge conflict
Fix content-type parsing from firefox.

Firefox sends "application/json; charset=UTF-8" as content-type rather
than only "application/json" like chrome.