diff --git a/stm-firmware/Makefile b/stm-firmware/Makefile
index 856fe2e..8e4e703 100644
--- a/stm-firmware/Makefile
+++ b/stm-firmware/Makefile
@@ -42,13 +42,12 @@ CFILES += stm-periph/unique-id.c
 CFILES += calibration.c
 CFILES += temp-converter.c
 CFILES += rotary-encoder.c button.c
-CFILES += stack-check.c
 CFILES += ui/lcd.c ui/menu.c reflow-menu.c
 CFILES += fatfs/diskio.c fatfs/ff.c fatfs/ffsystem.c fatfs/ffunicode.c fatfs/shimatta_sdio_driver/shimatta_sdio.c
 CFILES += pid-controller.c oven-driver.c
 CFILES += settings/settings.c settings/settings-sd-card.c
 CFILES += stm-periph/crc-unit.c
-CFILES += safety/safety-adc.c safety/safety-controller.c safety/watchdog.c safety/fault.c safety/safety-memory.c
+CFILES += safety/safety-adc.c safety/safety-controller.c safety/watchdog.c safety/fault.c safety/safety-memory.c safety/stack-check.c
 
 DEBUG_DEFINES = -DDEBUGBUILD
 RELEASE_DEFINES =
diff --git a/stm-firmware/include/reflow-controller/stack-check.h b/stm-firmware/include/reflow-controller/safety/stack-check.h
similarity index 100%
rename from stm-firmware/include/reflow-controller/stack-check.h
rename to stm-firmware/include/reflow-controller/safety/stack-check.h
diff --git a/stm-firmware/safety/safety-controller.c b/stm-firmware/safety/safety-controller.c
index 115e037..79cf6db 100644
--- a/stm-firmware/safety/safety-controller.c
+++ b/stm-firmware/safety/safety-controller.c
@@ -27,7 +27,7 @@
 #include <reflow-controller/safety/safety-config.h>
 #include <reflow-controller/safety/watchdog.h>
 #include <reflow-controller/safety/safety-adc.h>
-#include <reflow-controller/stack-check.h>
+#include <reflow-controller/safety/stack-check.h>
 #include <helper-macros/helper-macros.h>
 #include <stm-periph/crc-unit.h>
 #include <reflow-controller/systick.h>
diff --git a/stm-firmware/stack-check.c b/stm-firmware/safety/stack-check.c
similarity index 98%
rename from stm-firmware/stack-check.c
rename to stm-firmware/safety/stack-check.c
index d1ecb2c..9940c8c 100644
--- a/stm-firmware/stack-check.c
+++ b/stm-firmware/safety/stack-check.c
@@ -18,7 +18,7 @@
 * If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <reflow-controller/stack-check.h>
+#include <reflow-controller/safety/stack-check.h>
 #include <stdint.h>
 #include <stm-periph/rng.h>
 #include <stm-periph/crc-unit.h>
diff --git a/stm-firmware/shell.c b/stm-firmware/shell.c
index db8ef9d..e03c31c 100644
--- a/stm-firmware/shell.c
+++ b/stm-firmware/shell.c
@@ -33,7 +33,7 @@
 #include <reflow-controller/calibration.h>
 #include <reflow-controller/temp-converter.h>
 #include <fatfs/ff.h>
-#include <reflow-controller/stack-check.h>
+#include <reflow-controller/safety/stack-check.h>
 #include <reflow-controller/rotary-encoder.h>
 #include <reflow-controller/safety/safety-controller.h>
 #include <reflow-controller/settings/settings.h>