Gdk build fixes for recent refactorings.
Created attachment 13264 [details] gdk build fixes
Comment on attachment 13264 [details] gdk build fixes r=me
Commited in r19741