diff --git a/firmware/iar/ch.ewp b/firmware/iar/ch.ewp
index 0ec152b35c..d511913af1 100644
--- a/firmware/iar/ch.ewp
+++ b/firmware/iar/ch.ewp
@@ -1997,6 +1997,12 @@
       <file>
         <name>$PROJ_DIR$\..\config\engines\ford_fiesta.h</name>
       </file>
+      <file>
+        <name>$PROJ_DIR$\..\config\engines\geo_storm.cpp</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\config\engines\geo_storm.h</name>
+      </file>
       <file>
         <name>$PROJ_DIR$\..\config\engines\gm_2_2.cpp</name>
       </file>
@@ -3324,12 +3330,6 @@
   </group>
   <group>
     <name>util</name>
-    <file>
-      <name>$PROJ_DIR$\..\util\rfiutil.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\util\rfiutil.h</name>
-    </file>
     <file>
       <name>$PROJ_DIR$\..\util\cli_registry.cpp</name>
     </file>
@@ -3396,6 +3396,12 @@
     <file>
       <name>$PROJ_DIR$\..\util\loggingcentral.h</name>
     </file>
+    <file>
+      <name>$PROJ_DIR$\..\util\rfiutil.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\util\rfiutil.h</name>
+    </file>
   </group>
   <file>
     <name>$PROJ_DIR$\..\chconf.h</name>
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index e093210c13..b82a4150a9 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -108,6 +108,7 @@
 #include "eficonsole.h"
 #include "status_loop.h"
 #include "pin_repository.h"
+#include "flash_main.h"
 
 #if EFI_HD44780_LCD
 #include "lcd_HD44780.h"
diff --git a/win32_functional_tests/main.c b/win32_functional_tests/main.c
index 492d4f3ec7..9b9df2eb18 100644
--- a/win32_functional_tests/main.c
+++ b/win32_functional_tests/main.c
@@ -19,7 +19,6 @@
 #include "rusEfiFunctionalTest.h"
 #include "framework.h"
 
-#define SHELL_WA_SIZE       THD_WA_SIZE(4096)
 #define CONSOLE_WA_SIZE     THD_WA_SIZE(4096)
 
 static thread_t *cdtp;