diff --git a/firmware/console/binary/live_data.cpp b/firmware/console/binary/live_data.cpp
index 97443232ab..b0729ec43b 100644
--- a/firmware/console/binary/live_data.cpp
+++ b/firmware/console/binary/live_data.cpp
@@ -4,6 +4,8 @@
 
 #include "tunerstudio.h"
 #include "wideband_state_generated.h"
+#include "electronic_throttle_generated.h"
+#include "knock_controller_generated.h"
 
 template<>
 const output_channels_s* getLiveDataAddr() {
diff --git a/firmware/console/binary/tunerstudio.h b/firmware/console/binary/tunerstudio.h
index c644615982..a7b1d65fe2 100644
--- a/firmware/console/binary/tunerstudio.h
+++ b/firmware/console/binary/tunerstudio.h
@@ -8,8 +8,6 @@
 #pragma once
 #include "global.h"
 #include "tunerstudio_io.h"
-#include "electronic_throttle_generated.h"
-#include "knock_controller_generated.h"
 #include "FragmentEntry.h"
 
 typedef struct {
@@ -44,18 +42,7 @@ void requestBurn(void);
 
 void startTunerStudioConnectivity(void);
 
-#if defined __GNUC__
-// GCC
-#define pre_packed
-#define post_packed __attribute__((packed))
-#else
-// IAR
-#define pre_packed __packed
-#define post_packed
-#endif
-
-typedef pre_packed struct
-post_packed {
+typedef struct {
 	short int offset;
 	short int count;
 } TunerStudioWriteChunkRequest;