--- a/src/hotspot/share/opto/classes.hpp	Mon Dec 10 17:34:49 2018 +0300
+++ b/src/hotspot/share/opto/classes.hpp	Mon Dec 10 15:47:44 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -264,6 +264,21 @@
 macro(RoundFloat)
 macro(SafePoint)
 macro(SafePointScalarObject)
+#if INCLUDE_SHENANDOAHGC
+#define shmacro(x) macro(x)
+#else
+#define shmacro(x) optionalmacro(x)
+#endif
+shmacro(ShenandoahCompareAndExchangeP)
+shmacro(ShenandoahCompareAndExchangeN)
+shmacro(ShenandoahCompareAndSwapN)
+shmacro(ShenandoahCompareAndSwapP)
+shmacro(ShenandoahWeakCompareAndSwapN)
+shmacro(ShenandoahWeakCompareAndSwapP)
+shmacro(ShenandoahEnqueueBarrier)
+shmacro(ShenandoahReadBarrier)
+shmacro(ShenandoahWriteBarrier)
+shmacro(ShenandoahWBMemProj)
 macro(SCMemProj)
 macro(SqrtD)
 macro(SqrtF)