(cherry picked from commit 8311a78df5)
8311a78df5
Also removes a couple wrong Godot headers from third-party source files.