Minor changes to hrl file.
Added utility header.
Include files changes.