Could not compile webkit-minimal. These changes seemed to fix that.