Andhra Pradesh Chief Minsiter N Chandrababu Naidu on Wednesday said the government would amend the Building Act, if necessary, to make construction of water harvesting structures and planting of trees around buildings compulsory.