Fix mutually recursive require()s