diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index baf2a39523b7fee2bd4ce3bc219aaa25b164bf53..1e6bed12b4efe971332e485d07ceefc1f3914f2a 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -1916,6 +1916,24 @@ void Vehicle::_handleRadioStatus(mavlink_message_t& message)
     }
 }
 
+// Ignore warnings from mavlink headers for both GCC/Clang and MSVC
+#ifdef __GNUC__
+
+#if __GNUC__ > 8
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+#elif defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Waddress-of-packed-member"
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#endif
+
+#else
+#pragma warning(push, 0)
+#endif
+
 void Vehicle::_handleRCChannels(mavlink_message_t& message)
 {
     mavlink_rc_channels_t channels;
@@ -2003,6 +2021,17 @@ void Vehicle::_handleRCChannelsRaw(mavlink_message_t& message)
     emit rcChannelsChanged(channelCount, pwmValues);
 }
 
+// Pop warnings ignoring for mavlink headers for both GCC/Clang and MSVC
+#ifdef __GNUC__
+    #if defined(__clang__)
+        #pragma clang diagnostic pop
+    #else
+        #pragma GCC diagnostic pop
+    #endif
+#else
+#pragma warning(pop, 0)
+#endif
+
 void Vehicle::_handleScaledPressure(mavlink_message_t& message) {
     mavlink_scaled_pressure_t pressure;
     mavlink_msg_scaled_pressure_decode(&message, &pressure);
diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h
index bd5ac5a55aae7440167214d7e4c548e7ca65281e..b86335c35ccf129a98cd990bae7fc7c2ef17d7d8 100644
--- a/src/Vehicle/Vehicle.h
+++ b/src/Vehicle/Vehicle.h
@@ -9,24 +9,6 @@
 
 #pragma once
 
-// Ignore warnings from mavlink headers for both GCC/Clang and MSVC
-#ifdef __GNUC__
-
-#if __GNUC__ > 8
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Waddress-of-packed-member"
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#endif
-
-#else
-#pragma warning(push, 0)
-#endif
-
 #include <QElapsedTimer>
 #include <QObject>
 #include <QVariantList>
diff --git a/src/uas/UAS.h b/src/uas/UAS.h
index 6788cbeb604d5d1e57149b7f7e94faff9e2b4879..9a38b6d59e93afc78de343d89bac4c01996c6bd4 100644
--- a/src/uas/UAS.h
+++ b/src/uas/UAS.h
@@ -13,24 +13,6 @@
 
 #pragma once
 
-// Ignore warnings from mavlink headers for both GCC/Clang and MSVC
-#ifdef __GNUC__
-
-#if __GNUC__ > 8
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Waddress-of-packed-member"
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#endif
-
-#else
-#pragma warning(push, 0)
-#endif
-
 #include "UASInterface.h"
 #include <MAVLinkProtocol.h>
 #include <QVector3D>