Fixed headers for C++ compatibility