Add direct #includes of necessary types

This will be needed to land changes such as https://skia-review.googlesource.com/c/skia/+/980137

Change-Id: Ie8c54e7e5a41bced94d84a1db2a87dc53c9dffd4
Flag: NONE cleanup