Made some fixes so the headers can compile.