Minor clean up

Minor clean up of some of the files and added some missing #include ".h" files to some ".c" files.