Small source code header fixups