diff --git a/include/archi/chips/pulp/pulp.h b/include/archi/chips/pulp/pulp.h
index 72bf38e..2b4e7b2 100644
--- a/include/archi/chips/pulp/pulp.h
+++ b/include/archi/chips/pulp/pulp.h
@@ -25,7 +25,9 @@
 #include "archi/riscv/priv_1_10.h"
 #ifdef __ibex__
 #include "archi/ibex/mhpm.h"
-#else // __ibex__
+#elif defined(__cv32e40p__)
+#include "archi/cv32e40p/cv32e40p.h"
+#else
 #include "archi/riscv/pcer_v2.h"
 #endif // __ibex__
 #include "archi/itc/itc_v1.h"
diff --git a/include/hal/chips/pulp/pulp.h b/include/hal/chips/pulp/pulp.h
index 5b12fb6..2103f20 100644
--- a/include/hal/chips/pulp/pulp.h
+++ b/include/hal/chips/pulp/pulp.h
@@ -19,7 +19,9 @@
 
 #ifdef __ibex__
 #include "hal/ibex/ibex.h"
-#else // __ibex__
+#elif defined(__cv32e40p__)
+#include "hal/cv32e40p/cv32e40p.h"
+#else
 #include "hal/riscv/riscv_v5.h"
 #endif // __ibex__
 #include "hal/eu/eu_v3.h"