Bottled water is not included. You can buy the soda package on embarkation day at special stations set up for it - they will also have souvenir cups that are included. You don't HAVE to use the souvenir cup by the way...this is a common misundertanding. They will put a sticker on your cruise card too, which you can use to get regular bar glasses of soda. After embarkation day you can get the soda package at just about any bar. They often run out of the souvenir glasses so if you want to buy this I suggest you do it on embarkation day.
Personally I think the soda cards are not worth it for most people.