Include fixes for when drivers are built-in. (dm)