Yes my baby always has hiccups even until now. I've not found anyway to remedy it except to let it stop my itself.
You might also notice that will baby will shiver or sneeze a lot. All these are perfectly normal as it's their reflexes to changes in the new environment they are in. These reflexes will disappear as they enter into their 2nd month.
And yes, I didn't feed water to my baby until 6 mths. You might want to refer to this site for answers regarding why your doctor advised not to feed water: Preventing dehydration for breastfed babies in hot weather#