diff --git a/src/comm/QGCMAVLink.h b/src/comm/QGCMAVLink.h
index 7d1b88d9e7a3fa3df408406d8387193cc18356e6..e5810a75a7e6bed99e5f932ff0045cc02e486882 100644
--- a/src/comm/QGCMAVLink.h
+++ b/src/comm/QGCMAVLink.h
@@ -19,10 +19,19 @@
 #define MAVLINK_USE_MESSAGE_INFO
 #define MAVLINK_EXTERNAL_RX_STATUS  // Single m_mavlink_status instance is in QGCApplication.cc
 #include <stddef.h>                 // Hack workaround for Mav 2.0 header problem with respect to offsetof usage
+
+// Ignore warnings from mavlink headers for both GCC/Clang and MSVC
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+#pragma warning(push, 0)
+
 #include <mavlink_types.h>
 extern mavlink_status_t m_mavlink_status[MAVLINK_COMM_NUM_BUFFERS];
 #include <mavlink.h>
 
+#pragma GCC diagnostic pop
+#pragma warning(pop, 0)
+
 class QGCMAVLink {
 public:
     static bool isFixedWing(MAV_TYPE mavType);