Fix patch for includes