[fix] Wrong header guard
[fix] Bug copying EST_Content_Data spotted compiling with clang-3.4