diff --git a/hw/rtl/VX_core_wrapper.sv b/hw/rtl/VX_core_wrapper.sv
index 1c41c17a..ebb10647 100644
--- a/hw/rtl/VX_core_wrapper.sv
+++ b/hw/rtl/VX_core_wrapper.sv
@@ -1,4 +1,5 @@
 `include "VX_define.vh"
+`include "VX_gpu_pkg.sv"
 // TODO: move VX_define constants to parameters, and then parameterize in blackbox
 
 module Vortex import VX_gpu_pkg::*; #(
diff --git a/hw/rtl/cache/VX_cache_cluster.sv b/hw/rtl/cache/VX_cache_cluster.sv
index d54a06d0..18e26eb2 100644
--- a/hw/rtl/cache/VX_cache_cluster.sv
+++ b/hw/rtl/cache/VX_cache_cluster.sv
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 `include "VX_cache_define.vh"
-`include "VX_gpu_pkg.sv"
 
 module VX_cache_cluster import VX_gpu_pkg::*; #(
     parameter `STRING INSTANCE_ID    = "",
diff --git a/hw/rtl/core/VX_commit.sv b/hw/rtl/core/VX_commit.sv
index e5dbe97c..8c760845 100644
--- a/hw/rtl/core/VX_commit.sv
+++ b/hw/rtl/core/VX_commit.sv
@@ -12,6 +12,7 @@
 // limitations under the License.
 
 `include "VX_define.vh"
+`include "VX_gpu_pkg.sv"
 
 module VX_commit import VX_gpu_pkg::*; #(
     parameter CORE_ID = 0