Revert "inc: move an include again to see if we can adapt now"

This reverts commit 30991a0b.
Looks better, but firmware upgrade script changes need to propagate
to the install media first...