Nah, breaks the build for non-DESKTOP platforms anyway, as headers
delivered there are needed elsewhere. So just keep building that stuff
even if it presumably will not be needed on either of the non-DESKTOP
platforms.

This reverts commit 9b4212f1.