Applied deheader results (removed unnecessary .h includes)
Fixied cpp generation