--- old/src/hotspot/share/opto/classes.cpp	2018-06-08 19:45:28.001456114 +0200
+++ new/src/hotspot/share/opto/classes.cpp	2018-06-08 19:45:27.737444660 +0200
@@ -47,11 +47,17 @@
 #include "opto/rootnode.hpp"
 #include "opto/subnode.hpp"
 #include "opto/vectornode.hpp"
+#include "utilities/macros.hpp"
+#if INCLUDE_ZGC
+#include "gc/z/c2/zBarrierSetC2.hpp"
+#endif
 
 // ----------------------------------------------------------------------------
 // Build a table of virtual functions to map from Nodes to dense integer
 // opcode names.
 int Node::Opcode() const { return Op_Node; }
 #define macro(x) int x##Node::Opcode() const { return Op_##x; }
+#define optionalmacro(x)
 #include "classes.hpp"
 #undef macro
+#undef optionalmacro