Corrected cyclic inclusion bugs