Fixed the not building due to include gaurds
merged with trunk