The two changes are independent so they should be in separate patches.
About afxres.h vs. winres.h vs. winresrc.h, I believe it's mostly IDC_STATIC that was needed from winres.h. Unfortunately it's not being defined anywhere these days. In fact, all the Microsoft samples define it themselves.
How did your tests with Programming Windows 98 go? If it worked with that, then the patch can be considered good enough.