Fixed header-related compilation issues.