include: fix build

Merging fails...