diff --git a/src/hwlm/hwlm.c b/src/hwlm/hwlm.c
index c1c2837f..5d69e3c4 100644
--- a/src/hwlm/hwlm.c
+++ b/src/hwlm/hwlm.c
@@ -40,6 +40,7 @@
 #include "nfa/shufti.h"
 #include "nfa/truffle.h"
 #include "nfa/vermicelli.h"
+#include "nfa/vermicelli.hpp"
 #include <string.h>
 
 #define MIN_ACCEL_LEN_BLOCK  16
diff --git a/src/nfa/accel.c b/src/nfa/accel.c
index 34bd24a9..b35e0633 100644
--- a/src/nfa/accel.c
+++ b/src/nfa/accel.c
@@ -31,6 +31,7 @@
 #include "shufti.h"
 #include "truffle.h"
 #include "vermicelli.h"
+#include "vermicelli.hpp"
 #include "ue2common.h"
 
 const u8 *run_accel(const union AccelAux *accel, const u8 *c, const u8 *c_end) {
diff --git a/src/nfa/castle.c b/src/nfa/castle.c
index c7dd6d50..be29ca29 100644
--- a/src/nfa/castle.c
+++ b/src/nfa/castle.c
@@ -41,6 +41,7 @@
 #include "shufti.h"
 #include "truffle.h"
 #include "vermicelli.h"
+#include "vermicelli.hpp"
 #include "util/bitutils.h"
 #include "util/multibit.h"
 #include "util/partial_store.h"
diff --git a/src/nfa/lbr.c b/src/nfa/lbr.c
index 68e8e3f4..8fc83988 100644
--- a/src/nfa/lbr.c
+++ b/src/nfa/lbr.c
@@ -41,6 +41,7 @@
 #include "shufti.h"
 #include "truffle.h"
 #include "vermicelli.h"
+#include "vermicelli.hpp"
 #include "util/partial_store.h"
 #include "util/unaligned.h"
 
diff --git a/src/nfa/nfa_rev_api.h b/src/nfa/nfa_rev_api.h
index 370f96ef..72224c3b 100644
--- a/src/nfa/nfa_rev_api.h
+++ b/src/nfa/nfa_rev_api.h
@@ -36,6 +36,7 @@
 #include "accel.h"
 #include "nfa_internal.h"
 #include "vermicelli.h"
+#include "vermicelli.hpp"
 #include "util/unaligned.h"
 
 static really_inline
diff --git a/src/nfa/vermicelli_run.h b/src/nfa/vermicelli_run.h
index d6fe7ec7..b75f1414 100644
--- a/src/nfa/vermicelli_run.h
+++ b/src/nfa/vermicelli_run.h
@@ -27,6 +27,7 @@
  */
 
 #include "vermicelli.h"
+#include "vermicelli.hpp"
 
 static really_inline
 const u8 *find_xverm_run(char c, char nocase, u32 repeat, UNUSED const u8 *buf,
diff --git a/unit/internal/rvermicelli.cpp b/unit/internal/rvermicelli.cpp
index d89067d0..d29b1133 100644
--- a/unit/internal/rvermicelli.cpp
+++ b/unit/internal/rvermicelli.cpp
@@ -31,6 +31,7 @@
 
 #include "gtest/gtest.h"
 #include "nfa/vermicelli.h"
+#include "nfa/vermicelli.hpp"
 
 #define BOUND (~(VERM_BOUNDARY - 1))
 
@@ -563,4 +564,4 @@ TEST(RNVermicelli16, Exec5) {
     }
 }
 
-#endif // HAVE_SVE2
\ No newline at end of file
+#endif // HAVE_SVE2
diff --git a/unit/internal/vermicelli.cpp b/unit/internal/vermicelli.cpp
index dc458cb9..3319b87c 100644
--- a/unit/internal/vermicelli.cpp
+++ b/unit/internal/vermicelli.cpp
@@ -31,6 +31,7 @@
 
 #include "gtest/gtest.h"
 #include "nfa/vermicelli.h"
+#include "nfa/vermicelli.hpp"
 
 TEST(Vermicelli, ExecNoMatch1) {
     char t1[] = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
@@ -1150,4 +1151,4 @@ TEST(DoubleVermicelliMasked16,  Exec5) {
     }
 }
 
-#endif // HAVE_SVE2
\ No newline at end of file
+#endif // HAVE_SVE2