fixes #144 many cstyle/hdrchk warnings from make check in build log

Fixes #144, many cstyle failures in the build because of change #134.
I did my best to be minimally invasive and focused on getting cstyle
to pass.