Barking Puppy

Help please. My husband and I have a 5-month old wheaten terrier puppy. My husband works from home, so he is only crated at night. Starting at about 3 to 3.5 months, he would come up to one of us and bark to let us know he needed to go out. We live in a condo, so we thought this was great- it really limited the accidents.

After a couple weeks, he started barking when he was out of water or was hungry. We would then fill his water (we keep it available, but sometimes wouldn't notice if he emptied it) or feed him if it was close enough to meal time. I think he has now figured out that barking=getting what he wants. Last night, he barked and whined from 11:30pm-2am. I took him outside and gave him a drink, but those did not shut him up. He just wanted out of his crate and to play. We tried ignoring him, but he barked for 45 minutes straight. Eventually, we gave him a new bone (I didn't want to treat him for barking, but I couldn't take it anymore) and he gave up.

Again, we live in a condo, so barking all night isn't ok. And we need to sleep. How do we break him of this? This is the fourth night in a row that this has happened, although last night was the worst. He's been sleeping through the night without going out since about 9-10 weeks, so I know it isn't an actual need.

Thanks!