Fix cyclic inclusion recursion

Ugh, C++...