Cleaned up all (c) headers.
Merge remote-tracking branch 'origin/master'