Merge pull request #1953 from null77/gn-add-missing-headers

Add a couple missing headers to the GN build.