Include declaration locations, fix missing name on @interface in JSON