RFR(s): 8218041: Assorted wrong/missing includes

[Kim Barrett]

> On Jan 30, 2019, at 3:21 AM, Robbin Ehn <robbin.ehn at oracle.com> wrote:
> 
> Hi all, please review.
> 
> Code:
> http://cr.openjdk.java.net/~rehn/8218041/webrev/
> Issue:
> https://bugs.openjdk.java.net/browse/JDK-8218041

Looks good.