Finish the library job properly: JSON moved in VS2012.

Please confirm this compiles on your environments: had to modify extern files back to what I beileve they should have been to begin with.