To ease the review process the merge was split into 4 parts, WebCore, WebKit2, API tests and LayoutTests This is the second one, after this patch Nix should build libWebKitNix.so and be functional but without any tests yet.