More header fixing to allow static analysis