Unify inclusion schema
Fix broken egolib/bsp.c