Remove some header dependencies from SolverFactories