I have a kidney disease called Medullary Sponge Kidneys and have been proned to kidney stones and bladder infections for several years now (several times a year). I am always one to research everything and this is what I have found to actually 'cure' my episodes in having kidney stones.
I drink Marshmallow Root Tea everyday (at least once or twice). I also avoid taking calcium supplements even though they say they help. When I started taking them suddenly I was back having kidney stones. I also take Vitamin C, eat Watermelon and drink lots of water and herbal tea. Above anything though, as long as I drink the Marshmallow root tea I don't get any bladder infections or kidney stones. I cannot explain it nor can I say it will work for anyone else but for me the pain and stones are gone. I also avoid added salt, red meat, ham, canned vegetables and canned soups (in other words SALT!)
I have also managed to get rid of my migraine headaches in which I have had for over 10 years now with the help of a great book (controlled by diet alone!!) There are cures out there so research and try new things!