--- a/libr/arch/p/riscv_cs/plugin.c
+++ b/libr/arch/p/riscv_cs/plugin.c
@@ -2,6 +2,11 @@
 
 #include <r_arch.h>
 
+/* Forward+backward compat: CS_MODE_RISCVC -> CS_MODE_RISCV_C rename.
+ * #if can't pick the right name (identical macros across alpha6/7),
+ * so we pre-rename the enum before including capstone.h.
+ * ideally remove when capstone 6 gets fully released. */
+#define CS_MODE_RISCVC CS_MODE_RISCV_C
 #include <capstone/capstone.h>
 #if CS_API_MAJOR >= 5
 #include <capstone/riscv.h>
@@ -259,11 +264,7 @@
 }
 
 #define CSINC RISCV
-#if CS_NEXT_VERSION >= 6
 #define CSINC_MODE (CS_MODE_RISCV_C | ((as->config->bits == 64)? CS_MODE_RISCV64: CS_MODE_RISCV32))
-#else
-#define CSINC_MODE (CS_MODE_RISCVC | ((as->config->bits == 64)? CS_MODE_RISCV64: CS_MODE_RISCV32))
-#endif
 #include "../capstone.inc.c"