This reverts commit bc061779. Be more careful with #includes to avoid linker errors on some buildbots.