I have a patch to break this dependency and move the inclusion to a few of the cpp files instead.
Created attachment 235876 [details] Patch
Created attachment 235877 [details] Patch
Created attachment 235881 [details] Patch