ifndef stuff in the headers added.