Allow circular injection for properties.
Handles circular dependencies.
Allow injecting circular dependencies.
Fix headers.