[sr-dev] git:master:cf83221d: core, lib, modules: updated include paths for header files