diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp
index 3dbc340e1f..9288a0f0a2 100644
--- a/firmware/console/binary/tunerstudio.cpp
+++ b/firmware/console/binary/tunerstudio.cpp
@@ -74,7 +74,6 @@
 #include "bluetooth.h"
 #include "tunerstudio_io.h"
 #include "trigger_scope.h"
-#include "software_knock.h"
 #include "electronic_throttle.h"
 #include "live_data.h"
 #include "efi_quote.h"
diff --git a/firmware/controllers/sensors/impl/software_knock.cpp b/firmware/controllers/sensors/impl/software_knock.cpp
index 6b509f0999..4ad1e10115 100644
--- a/firmware/controllers/sensors/impl/software_knock.cpp
+++ b/firmware/controllers/sensors/impl/software_knock.cpp
@@ -1,12 +1,11 @@
 #include "pch.h"
 
+#if EFI_SOFTWARE_KNOCK
+
 #include "biquad.h"
 #include "thread_controller.h"
 #include "knock_logic.h"
 #include "software_knock.h"
-
-#if EFI_SOFTWARE_KNOCK
-
 #include "knock_config.h"
 #include "ch.hpp"
 
diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp
index 5cb7525df2..8f502252d0 100644
--- a/firmware/hw_layer/hardware.cpp
+++ b/firmware/hw_layer/hardware.cpp
@@ -45,7 +45,9 @@
 #include "vvt.h"
 #include "trigger_emulator_algo.h"
 #include "boost_control.h"
+#if EFI_SOFTWARE_KNOCK
 #include "software_knock.h"
+#endif
 #include "trigger_scope.h"
 #include "init.h"
 #if EFI_MC33816