Merge pull request #2293 from JosJuice/main-unnecessary-include Main: Remove unnecessary shellapi.h include