Add dependency between headers.
Fix missing variable.
Fix warning.