Fix build

Aleix Pol Gonzalezrequested to merge
work/apol/includes into master

Ever since I last updated, I've started to get errors about includes missing, so I've added them.

Merge request reports