R.M.
My son has the same problem!! I would NOT take away anything or punish him for this!! Dont let him have anything to drink 2 hours before he goes to bed. Make sure he drinks plenty of water through the day. You may want to check out Pacific International. We are doing a program with them now. It is not his fault!
Good luck