added header paths from refactored core-common-lib