init* : header argument changes

Minor header argument changes. Removed errenous constructs and
definitions I'm not using.