diff --git a/riscv64-tok.h b/riscv64-tok.h
index eeaa29c6..2bf3fe50 100644
--- a/riscv64-tok.h
+++ b/riscv64-tok.h
@@ -472,4 +472,6 @@
  DEF_ASM_FENCE(ior)
  DEF_ASM_FENCE(iorw)
 
+#undef DEF_ASM_FENCE
 #undef DEF_ASM_WITH_SUFFIX
+#undef DEF_ASM_WITH_SUFFIXES