Added #ifndef statements at the begining of header files