9 files changed, 10 insertions, 10 deletions
diff --git a/rtl/core/decode/branch.sv b/rtl/core/decode/branch.sv
index 9916374..1dbc1ad 100644
--- a/rtl/core/decode/branch.sv
+++ b/rtl/core/decode/branch.sv
@@ -1,4 +1,4 @@
-`include "core/isa.sv"
+`include "core/decode/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode_branch
diff --git a/rtl/core/decode/conds.sv b/rtl/core/decode/conds.sv
index 564ed27..60922a0 100644
--- a/rtl/core/decode/conds.sv
+++ b/rtl/core/decode/conds.sv
@@ -1,4 +1,4 @@
-`include "core/isa.sv"
+`include "core/decode/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode_conds
diff --git a/rtl/core/decode/data.sv b/rtl/core/decode/data.sv
index e2a44df..cb21f5e 100644
--- a/rtl/core/decode/data.sv
+++ b/rtl/core/decode/data.sv
@@ -1,4 +1,4 @@
-`include "core/isa.sv"
+`include "core/decode/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode_data
diff --git a/rtl/core/decode/decode.sv b/rtl/core/decode/decode.sv
index 73d3b59..5e72afe 100644
--- a/rtl/core/decode/decode.sv
+++ b/rtl/core/decode/decode.sv
@@ -1,4 +1,4 @@
-`include "core/isa.sv"
+`include "core/decode/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode
diff --git a/rtl/core/isa.sv b/rtl/core/decode/isa.sv
index c98cfd9..baaf371 100644
--- a/rtl/core/isa.sv
+++ b/rtl/core/decode/isa.sv
@@ -1,5 +1,5 @@
-`ifndef CORE_ISA_SV
-`define CORE_ISA_SV
+`ifndef CORE_DECODE_ISA_SV
+`define CORE_DECODE_ISA_SV
 
 `define FIELD_COND [31:28]
 `define FIELD_OP   [27:0]
diff --git a/rtl/core/decode/ldst/misc.sv b/rtl/core/decode/ldst/misc.sv
index f2fe258..d8ac898 100644
--- a/rtl/core/decode/ldst/misc.sv
+++ b/rtl/core/decode/ldst/misc.sv
@@ -1,4 +1,4 @@
-`include "core/isa.sv"
+`include "core/decode/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode_ldst_misc
diff --git a/rtl/core/decode/ldst/multiple.sv b/rtl/core/decode/ldst/multiple.sv
index d286a67..201f333 100644
--- a/rtl/core/decode/ldst/multiple.sv
+++ b/rtl/core/decode/ldst/multiple.sv
@@ -1,4 +1,4 @@
-`include "core/isa.sv"
+`include "core/decode/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode_ldst_multiple
diff --git a/rtl/core/decode/ldst/single.sv b/rtl/core/decode/ldst/single.sv
index 0665178..402c17b 100644
--- a/rtl/core/decode/ldst/single.sv
+++ b/rtl/core/decode/ldst/single.sv
@@ -1,4 +1,4 @@
-`include "core/isa.sv"
+`include "core/decode/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode_ldst_single
diff --git a/rtl/core/decode/snd.sv b/rtl/core/decode/snd.sv
index 4dbb028..4e8de96 100644
--- a/rtl/core/decode/snd.sv
+++ b/rtl/core/decode/snd.sv
@@ -1,4 +1,4 @@
-`include "core/isa.sv"
+`include "core/decode/isa.sv"
 `include "core/uarch.sv"
 
 module core_decode_snd