Removed header dependencies