(At a random point, since it came to my mind here): I suggest you do the reverse include order. In this case:
* first include mortevielle.h
* include other files from morteville/
* include files from other ScummVM modules
The current way hidden requirements to include certain headers before others come up.