fixed compilation
made include resolving more optimistic.