change: prefixing includes to make lib component dependencies visible