Add code to get around cyclic include problem
1 file changed