diff --git a/rtl/cluster_interconnect_wrap.sv b/rtl/cluster_interconnect_wrap.sv
index 015e9df..ab731eb 100644
--- a/rtl/cluster_interconnect_wrap.sv
+++ b/rtl/cluster_interconnect_wrap.sv
@@ -16,9 +16,8 @@
 
 `include "hci_helpers.svh"
 
-import hci_package::*;
-
 module cluster_interconnect_wrap
+import hci_package::*;
 #(
   parameter NB_CORES        = 12,
   parameter HWPE_PRESENT    = 1,
diff --git a/rtl/hwpe_subsystem.sv b/rtl/hwpe_subsystem.sv
index 372b4e4..53576a4 100644
--- a/rtl/hwpe_subsystem.sv
+++ b/rtl/hwpe_subsystem.sv
@@ -15,10 +15,9 @@
 
 `include "hci_helpers.svh"
 
+module hwpe_subsystem
 import hci_package::*;
 import pulp_cluster_package::*;
-
-module hwpe_subsystem
 #(
   parameter  hwpe_subsystem_cfg_t HWPE_CFG = '0,
   parameter  int unsigned N_CORES          = 8,