I discussed the fix with Dirk and it looks like it is minimal and should not impact our public API. Attaching the change here, FYI Darin.
Created attachment 115085 [details] Proposed build fix.
Landed in http://trac.webkit.org/changeset/100234.