diff --git a/include/libopencmsis/dispatch/irqhandlers.h b/include/libopencmsis/dispatch/irqhandlers.h
index e8ac859f..907b2474 100644
--- a/include/libopencmsis/dispatch/irqhandlers.h
+++ b/include/libopencmsis/dispatch/irqhandlers.h
@@ -17,7 +17,11 @@
 #elif defined(STM32L4)
 #	include <libopencmsis/stm32/l4/irqhandlers.h>
 #elif defined(STM32G0)
-#	include <libopencmsis/stm32/l4/irqhandlers.h>
+#	include <libopencmsis/stm32/g0/irqhandlers.h>
+#elif defined(STM32G4)
+#	include <libopencmsis/stm32/g4/irqhandlers.h>
+#elif defined(STM32H7)
+#	include <libopencmsis/stm32/h7/irqhandlers.h>
 
 #elif defined(GD32F1X0)
 #	include <libopencmsis/gd32/f1x0/irqhandlers.h>