Fixed: not c++'ish headers