bc8c892c65
Also move a few more headers that included WM headers. Pull Request: https://projects.blender.org/blender/blender/pulls/110815