Addressing @haukepetersen comments on includes