Modify utility header and implementation file to cut down on some header processing