Added debug
Modified headers for C++
...