We show how the infra-red divergences associated to Goldstone bosons in the minimum condition of the two-loop Landau-gauge effective potential can be avoided in general field theories. This extends the resummation formalism recently developed for the Standard Model and the MSSM, and we give compact, infra-red finite expressions in closed form for the tadpole equations. We also show that the results at this loop order are equivalent to (and are most easily obtained by) imposing an " on-shell " condition for the Goldstone bosons. Moreover, we extend the approach to show how the infra-red divergences in the calculation of the masses of neutral scalars (such as the Higgs boson) can be eliminated. For the mass computation, we specialise to the gaugeless limit and extend the effective potential computation to allow the masses to be determined without needing to solve differential equations for the loop functions — opening the door to fast, infra-red safe determinations of the Higgs mass in general theories.