Fixed includes in core/utils