Fix problems with mutually recursive included functions