Revert "inc: build fixes"

This reverts commit 3c4d435fc08e78110ec79897edf6e5b97455934f.