Minor changes to headers.  Corrections and additions to autotools build.