Then most likely the stones are of oxalate type or
…because of repeated infections. Those are larger magnesium phosphate kind of stones not oxalates.
Rarely cystiene type stones.
Like you said, it is plenty of water that is best. Juices or fruits/vegetables etc do not count because they do not increase urine flow as much.
Bigger oxalate stones need to be either cracked with lithotriosy and if that fails, surgical removal.
Smaller stones may pass simply by hydration on their own with off course the pain. 
Sometimes obstruction in urinary tract can be found and be treated. An IVP dye test helps then to figure that out. Next step may be cystoscopy.
Five things are important:
1- Hydration. To have large urine output. This can be difficult especially if travelling or fasting.
2- Mag-Citrate for oxalate stones.
3- Spasmolytics/pain killers. (Preferably Not NSAID like motrin)
4- Prevention of further stones by diet change etc.
5- Antibiotics to clear infection quickly. It is a cycle: Stones cause infection, infection cause stones.