Data Interaction build fixes
Created attachment 303236 [details] Patch
Created attachment 303241 [details] Patch
https://trac.webkit.org/r213308