I noticed that the ZHeap includes needed a bit of a cleanup, as there are many includes that are not longer needed, and a few are missing. Bug: https://bugs.openjdk.java.net/browse/JDK-8231251 Webrev: http://cr.openjdk.java.net/~pliden/8231251/webrev.0 /Per