Fix circular dependencies in inline