diff --git a/.gitignore b/.gitignore
index b6fa4a66fde5141584791960b73d60e0f11f6301..9a2bdcbc9aa73a70ea1c15163638210a5a934b00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ lint/*
 accelerator/html/*
 wrapper/html/*
 system/src/bootrom
+system/src/defines
 system/html/*
 flist/tmp
 
diff --git a/flist/project/top.flist b/flist/project/top.flist
index 921ee5eff06887058261e278fbcdff76d4548abd..c87d9bec9506e498c15bfcddee635d3463533e3b 100644
--- a/flist/project/top.flist
+++ b/flist/project/top.flist
@@ -18,6 +18,9 @@
 +libext+.v+.vlib
 
 // =============    System Filelist      =========================
+// - Defines RTL
++incdir+$(SOCLABS_PROJECT_DIR)/system/src/defines
+
 -f $(SOCLABS_PROJECT_DIR)/flist/project/system.flist
 
 // NanoSoC Testbench
diff --git a/flist/project/top_qs.flist b/flist/project/top_qs.flist
index 5903d2ec7772043e3570364156a4dd826a3e92b0..669cdfb1750033c598188fc79db452aa2ce2bd64 100644
--- a/flist/project/top_qs.flist
+++ b/flist/project/top_qs.flist
@@ -18,6 +18,9 @@
 +libext+.v+.vlib
 
 // =============    System Filelist      =========================
+// - Defines RTL
++incdir+$(SOCLABS_PROJECT_DIR)/system/src/defines
+
 -f $(SOCLABS_PROJECT_DIR)/flist/project/system.flist
 
 // NanoSoC Testbench
diff --git a/nanosoc_tech b/nanosoc_tech
index 9f373b184f58970d13e6537b32cbff89bf0d5c41..c9fdff1c194006538c38dd05910ec515fdda914c 160000
--- a/nanosoc_tech
+++ b/nanosoc_tech
@@ -1 +1 @@
-Subproject commit 9f373b184f58970d13e6537b32cbff89bf0d5c41
+Subproject commit c9fdff1c194006538c38dd05910ec515fdda914c
diff --git a/soctools_flow b/soctools_flow
index d5eff403783409ceaafb0daa5129bd581b3e54e1..0bc8c4b1955d0fdc17dbfb7bde7840cbb0c9b615 160000
--- a/soctools_flow
+++ b/soctools_flow
@@ -1 +1 @@
-Subproject commit d5eff403783409ceaafb0daa5129bd581b3e54e1
+Subproject commit 0bc8c4b1955d0fdc17dbfb7bde7840cbb0c9b615