Merge pull request #6845 from lioncash/patch-dlg NewPatchDialog/PatchesWidget: Use forward declarations where applicable