--- old/src/hotspot/share/opto/multnode.cpp	2018-11-06 17:19:59.206505670 +0100
+++ new/src/hotspot/share/opto/multnode.cpp	2018-11-06 17:19:59.046506823 +0100
@@ -33,10 +33,6 @@
 #include "opto/regmask.hpp"
 #include "opto/type.hpp"
 #include "utilities/vmError.hpp"
-#include "utilities/macros.hpp"
-#if INCLUDE_SHENANDOAHGC
-#include "gc/shenandoah/c2/shenandoahSupport.hpp"
-#endif
 
 //=============================================================================
 //------------------------------MultiNode--------------------------------------